diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e2fad678e13..32421d2c9bb 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -25,15 +25,15 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/html.formbarcode.class.php");
 
 $langs->load("admin");
 
-if (!$user->admin)
-	accessforbidden();
+if (!$user->admin) accessforbidden();
 
 $action = GETPOST("action");
 
+
 /*
  * Actions
  */
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
new file mode 100644
index 00000000000..703715c15c4
--- /dev/null
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2007-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 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/>.
+*
+*/
+
+/**
+ *      \file       htdocs/includes/barcode/html.formbarcode.class.php
+ *      \brief      Fichier de la classe des fonctions predefinie de composants html
+ */
+
+
+/**
+ *       \class      Form
+ *       \brief      Classe permettant la generation de composants html
+ */
+class FormBarCode
+{
+    var $db;
+    var $error;
+
+
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB		$db		Database handler
+     */
+    function FormBarCode($db)
+    {
+        $this->db = $db;
+
+        return 1;
+    }
+
+
+    /**
+     *	Return HTML select with list of bar code generators
+     *
+     *  @param	int		$selected       Id code pre-selected
+     *  @param 	array	$barcodelist	Array of barcodes generators
+     *  @param  int		$code_id        Id du code barre
+     *  @param  int		$idForm			Id du formulaire
+     * 	@return	string					HTML select string
+     */
+    function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode')
+    {
+        global $conf, $langs;
+
+        $disable = '';
+
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#select'.$idForm.'").change(function() {
+                            var formName = document.getElementById("form'.$idForm.'");
+                            formName.action.value="setcoder";
+                            formName.submit();
+                        });
+               });';
+            print '</script>'."\n";
+            //onChange="barcode_coder_save(\''.$idForm.'\')
+        }
+
+        // We check if barcode is already selected by default
+        if ((($conf->product->enabled || $conf->service->enabled) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+        ($conf->societe->enabled && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+        {
+            $disable = 'disabled="disabled"';
+        }
+
+        $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
+        $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $select_encoder.= '<input type="hidden" name="action" value="update">';
+        $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
+        $select_encoder.= '<option value="0"'.($selected==0?' selected="selected"':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+        $select_encoder.= '<option value="-1" disabled="disabled">--------------------</option>';
+        foreach($barcodelist as $key => $value)
+        {
+            $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected="selected"':'').'>'.$value.'</option>';
+        }
+        $select_encoder.= '</select></form>';
+
+        return $select_encoder;
+    }
+
+    /**
+     *	Return form to select type of barcode
+     *
+     *	@param	int		$selected          Id code pre-selected
+     *  @param	string	$htmlname          Nom de la zone select
+     *  @param  int		$useempty          Affiche valeur vide dans liste
+     *  @return	void
+     */
+    function select_barcode_type($selected='',$htmlname='coder_id',$useempty=0)
+    {
+        global $langs,$conf;
+
+        $sql = "SELECT rowid, code, libelle";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+        $sql.= " WHERE coder <> '0'";
+        $sql.= " AND entity = ".$conf->entity;
+        $sql.= " ORDER BY code";
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+
+            if ($useempty && $num > 0)
+            {
+                print '<select class="flat" name="'.$htmlname.'">';
+                print '<option value="0">&nbsp;</option>';
+            }
+            else
+            {
+                print '<select disabled="disabled" class="flat" name="'.$htmlname.'">';
+                print '<option value="0" selected="selected">'.$langs->trans('NoActivatedBarcode').'</option>';
+            }
+
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                if ($selected == $obj->rowid)
+                {
+                    print '<option value="'.$obj->rowid.'" selected="selected">';
+                }
+                else
+                {
+                    print '<option value="'.$obj->rowid.'">';
+                }
+                print $obj->libelle;
+                print '</option>';
+                $i++;
+            }
+            print "</select>";
+        }
+        else {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *  Show form to select type of barcode
+     *
+     *  @param  string		$page        	Page
+     *  @param  int			$selected    	Id condition preselected
+     *  @param  string		$htmlname    	Nom du formulaire select
+     *  @return	void
+     */
+    function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
+    {
+        global $langs,$conf;
+        if ($htmlname != "none")
+        {
+            print '<form method="post" action="'.$page.'">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="setbarcodetype">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            $this->select_barcode_type($selected, $htmlname, 1);
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+            print '</td></tr></table></form>';
+        }
+    }
+
+}
+
+?>
diff --git a/htdocs/core/modules/barcode/phpbarcode.modules.php b/htdocs/core/modules/barcode/phpbarcode.modules.php
index 7eb8f6fab32..72f532d5f83 100644
--- a/htdocs/core/modules/barcode/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/phpbarcode.modules.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,8 +34,10 @@ class modPhpbarcode extends ModeleBarCode
 	var $error='';
 
 
-	/**     \brief     	Return if a module can be used or not
-	 *      \return		boolean     true if module can be used
+	/**
+	 * 	Return if a module can be used or not
+	 *
+	 *  @return		boolean     true if module can be used
 	 */
 	function isEnabled()
 	{
@@ -43,19 +45,23 @@ class modPhpbarcode extends ModeleBarCode
 	}
 
 
-	/**     \brief      Return description
-	 *      \return     string      Texte descripif
+	/**
+	 * 	Return description
+	 *
+	 * 	@return     string      Texte descripif
 	 */
 	function info()
 	{
 		global $langs;
 
-		return 'Php-barcode';
+		return 'Internal engine';
 	}
 
-	/**     \brief      Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *                  de conflits qui empechera cette numerotation de fonctionner.
-	 *      \return     boolean     false si conflit, true si ok
+	/**
+	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *	@return     boolean     false si conflit, true si ok
 	 */
 	function canBeActivated()
 	{
@@ -66,8 +72,9 @@ class modPhpbarcode extends ModeleBarCode
 
 
 	/**
-	 *	\brief		Return true if encodinf is supported
-	 *	\return		int		>0 if supported, 0 if not
+	 *	Return true if encodinf is supported
+	 *
+	 *	@return		int		>0 if supported, 0 if not
 	 */
 	function encodingIsSupported($encoding)
 	{
diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php
deleted file mode 100644
index d4435dbe8b7..00000000000
--- a/htdocs/includes/barcode/html.formbarcode.class.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/* Copyright (C) 2007-2009 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 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/>.
- *
- */
-
-/**
- *      \file       htdocs/includes/barcode/html.formbarcode.class.php
- *      \brief      Fichier de la classe des fonctions predefinie de composants html
- */
-
-
-/**
- *       \class      Form
- *       \brief      Classe permettant la generation de composants html
- */
-class FormBarCode
-{
-	var $db;
-	var $error;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB		$db		Database handler
-	 */
-	function FormBarCode($db)
-	{
-		$this->db = $db;
-
-		return 1;
-	}
-
-
-	/**
-	 *	Return HTML select with list of bar code generators
-	 *  @param      selected        Id code pre-selected
-	 *  @param 		barcodelist		Array of barcodes generators
-	 *  @param      code_id         Id du code barre
-	 *  @param      idForm			Id du formulaire
-	 * 	@return		string			HTML select string
-	 */
-	function setBarcodeEncoder($selected=0,$barcodelist,$code_id,$idForm='formbarcode')
-	{
-		global $conf, $langs;
-
-		$disable = '';
-
-		if ($conf->use_javascript_ajax)
-		{
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
-                        jQuery("#select'.$idForm.'").change(function() {
-                            var formName = document.getElementById("form'.$idForm.'");
-                            formName.action.value="setcoder";
-                            formName.submit();
-                        });
-               });';
-            print '</script>'."\n";
-    		 //onChange="barcode_coder_save(\''.$idForm.'\')
-		}
-
-		// We check if barcode is already selected by default
-		if ((($conf->product->enabled || $conf->service->enabled) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-		    ($conf->societe->enabled && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
-		{
-			$disable = 'disabled="disabled"';
-		}
-
-		$select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
-		$select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$select_encoder.= '<input type="hidden" name="action" value="update">';
-		$select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-		$select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
-		$select_encoder.= '<option value="0"'.($selected==0?' selected="selected"':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-		$select_encoder.= '<option value="-1" disabled="disabled">--------------------</option>';
-		foreach($barcodelist as $key => $value)
-		{
-			$select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected="selected"':'').'>'.$value.'</option>';
-		}
-		$select_encoder.= '</select></form>';
-
-		return $select_encoder;
-	}
-
-   /**
-     *    \brief      Retourne la liste des types de codes barres
-     *    \param      selected          Id code pre-selected
-     *    \param      htmlname          Nom de la zone select
-     *    \param      useempty          Affiche valeur vide dans liste
-     */
-    function select_barcode_type($selected='',$htmlname='coder_id',$useempty=0)
-    {
-        global $langs,$conf;
-
-        $sql = "SELECT rowid, code, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql.= " WHERE coder <> '0'";
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY code";
-
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-
-            if ($useempty && $num > 0)
-            {
-            	print '<select class="flat" name="'.$htmlname.'">';
-            	print '<option value="0">&nbsp;</option>';
-            }
-            else
-            {
-            	print '<select disabled="disabled" class="flat" name="'.$htmlname.'">';
-            	print '<option value="0" selected="selected">'.$langs->trans('NoActivatedBarcode').'</option>';
-            }
-
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected="selected">';
-                }
-                else
-                {
-                    print '<option value="'.$obj->rowid.'">';
-                }
-                print $obj->libelle;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-        }
-        else {
-            dol_print_error($this->db);
-        }
-    }
-
-   /**
-     *    	\brief      Affiche formulaire de selection du type de code barre
-     *    	\param      page        	Page
-     *    	\param      selected    	Id condition pr�-s�lectionn�e
-     *    	\param      htmlname    	Nom du formulaire select
-     */
-    function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
-    {
-        global $langs,$conf;
-        if ($htmlname != "none")
-        {
-            print '<form method="post" action="'.$page.'">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="setbarcodetype">';
-            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-            print '<tr><td>';
-            $this->select_barcode_type($selected, $htmlname, 1);
-            print '</td>';
-            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-            print '</td></tr></table></form>';
-        }
-    }
-
-}
-
-?>
diff --git a/htdocs/includes/barcode/php-barcode/black.png b/htdocs/includes/barcode/php-barcode/black.png
deleted file mode 100644
index d4f33fe3db8..00000000000
Binary files a/htdocs/includes/barcode/php-barcode/black.png and /dev/null differ
diff --git a/htdocs/includes/barcode/php-barcode/encode_bars.php b/htdocs/includes/barcode/php-barcode/encode_bars.php
deleted file mode 100644
index 5f1625777e6..00000000000
--- a/htdocs/includes/barcode/php-barcode/encode_bars.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/*
- *
- * Built-In Encoders
- * Part of PHP-Barcode 0.3pl1
- *
- * (C) 2001,2002,2003,2004 by Folke Ashberg <folke@ashberg.de>
- *
- * The newest version can be found at http://www.ashberg.de/bar
- *
- * This program is free software; you can 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/>.
- *
- */
-
-function barcode_gen_ean_sum($ean){
-  $even=true; $esum=0; $osum=0;
-  for ($i=strlen($ean)-1;$i>=0;$i--){
-	if ($even) $esum+=$ean[$i];	else $osum+=$ean[$i];
-	$even=!$even;
-  }
-  return (10-((3*$esum+$osum)%10))%10;
-}
-
-/* barcode_encode_ean(code [, encoding])
- *   encodes $ean with EAN-13 using builtin functions
- *
- *   return:
- *    array[encoding] : the encoding which has been used (EAN-13)
- *    array[bars]     : the bars
- *    array[text]     : text-positioning info
- */
-function barcode_encode_ean($ean, $encoding = "EAN-13"){
-    $digits=array(3211,2221,2122,1411,1132,1231,1114,1312,1213,3112);
-    $mirror=array("000000","001011","001101","001110","010011","011001","011100","010101","010110","011010");
-    $guards=array("9a1a","1a1a1","a1a");
-
-    $ean=trim($ean);
-    if (preg_match("/[^0-9]/i",$ean)){
-	return array("text"=>"Invalid EAN-Code");
-    }
-    $encoding=strtoupper($encoding);
-    if ($encoding=="ISBN"){
-	if (!preg_match("/^978/", $ean)) $ean="978".$ean;
-    }
-    if (preg_match("/^978/", $ean)) $encoding="ISBN";
-    if (strlen($ean)<12 || strlen($ean)>13){
-	return array("text"=>"Invalid $encoding Code (must have 12/13 numbers)");
-    }
-
-    $ean=substr($ean,0,12);
-    $eansum=barcode_gen_ean_sum($ean);
-    $ean.=$eansum;
-    $line=$guards[0];
-    for ($i=1;$i<13;$i++){
-	$str=$digits[$ean[$i]];
-	if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str;
-	if ($i==6) $line.=$guards[1];
-    }
-    $line.=$guards[2];
-
-    /* create text */
-    $pos=0;
-    $text="";
-    for ($a=0;$a<13;$a++){
-	if ($a>0) $text.=" ";
-	$text.="$pos:12:{$ean[$a]}";
-	if ($a==0) $pos+=12;
-	else if ($a==6) $pos+=12;
-	else $pos+=7;
-    }
-
-    return array(
-		"encoding" => $encoding,
-		"bars" => $line,
-		"text" => $text
-		);
-}
-
-?>
diff --git a/htdocs/includes/barcode/php-barcode/genbarcode/GPL b/htdocs/includes/barcode/php-barcode/genbarcode/GPL
deleted file mode 100644
index 60549be514a..00000000000
--- a/htdocs/includes/barcode/php-barcode/genbarcode/GPL
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/htdocs/includes/barcode/php-barcode/genbarcode/README b/htdocs/includes/barcode/php-barcode/genbarcode/README
deleted file mode 100644
index f1e55cd8fe3..00000000000
--- a/htdocs/includes/barcode/php-barcode/genbarcode/README
+++ /dev/null
@@ -1,122 +0,0 @@
-Genbarcode 0.4
-
-Genbarcode can't generate barcode-images, but a string which can
-be used by image-creators, such as my PHP-Barcode
-
-Encoding is done using GNU-Barcode (libbarcode), which can be found
-at http://www.gnu.org/software/barcode/
-
-(C) 2001,2002,2003 by Folke Ashberg <folke@ashberg.de>
-
-The newest Version can be found at http://www.ashberg.de/bar
-
-
-UNIX-INSTALLATION:
-
-First of all you need GNU barcode, a barcode creation/encoding library.
-GNU barcode can be foud at http://www.gnu.org/software/barcode/ , or
-install it using your favourite package-manager, e.g.
-    debian: # apt-get install barcode
-    SuSE  : # rpm -i /path-to/barcode.rpm ; rpm -i /path-to/barcode/devel.rpm 
-Or compile and install the source yourself:
-    $ tar xfvz barcode-0.98.tar.gz
-    $ cd barcode-0.98
-    $ ./configure
-    $ make
-    become root ( $ su )
-    # make install
-    # ldconfig
-
-Then compile genbarcode:
-    Just type 
-    $ make
-    become root ( $ su )
-    # make install
-
-BSD Notice:
-You have to use gmake (GNU version of make), which can be found in the
-ports-collection. Take a look at /usr/ports/devel/gmake and 'make install'.
-Then type instead of 'make' 'gmake'
-
-
-WINDOWS-INSTALLATION:
-
-You can compile genbarcode with Borlands Free C++Builder Command Lines Tools 5.5
-You need the windows-source-package, which includes gnu-barcode-0.98 and libpaper
-Make-win.inc assumes that C++Builder has been installed to c:\borland\bcc55
-run 
-   c:\borland\bcc55\bin\bcc32 -f Makefile-win
-and copy the created file genarcode.exe to any directory.
-
-
-
-That's all.
-
-
-USAGE:
-
-$ genbarcode 
-Genbarcode 0.4, Copyright (C) 2001,2002,2003 by Folke Ashberg
-Genbarcode comes with ABSOLUTELY NO WARRANTY.
-
-Usage genbarcode <code> [<encoding>]
-
-You can use the following types:
-ANY    choose best-fit (default)
-EAN    8 or 13 EAN-Code
-UPC    12-digit EAN 
-ISBN   isbn numbers (still EAN-13) 
-39     code 39 
-128    code 128 (a,b,c: autoselection) 
-128C   code 128 (compact form for digits)
-128B   code 128, full printable ascii 
-I25    interleaved 2 of 5 (only digits) 
-128RAW Raw code 128 (by Leonid A. Broukhis)
-CBR    Codabar (by Leonid A. Broukhis) 
-MSI    MSI (by Leonid A. Broukhis) 
-PLS    Plessey (by Leonid A. Broukhis)
-
-Example:
-
-$ genbarcode 012345678901
-9a1a2221212214111132123111141a1a1131212133112321122212122a1a
-0:12:0 12:12:1 19:12:2 26:12:3 33:12:4 40:12:5 47:12:6 59:12:7 66:12:8 73:12:9 80:12:0 87:12:1 94:12:2
-EAN-13
-
-The three lines:
-Line 1: The bars
-Line 2: The positions for the single characters
-Line 3: What encoding has been used
-
-The bar-string:
-Read char by char, all odd chars represent a space, all even a bar:
-<space-width><bar-width><space-width><bar-width>...
-
-An alphabetic character defines a tall bar, all others small ones.
-
-The character-string:
-<position>:<font-size>:<character> ...
- 
-For programmers:
-1. Count the total width using bar-string
-2. Allocate the image
-3. Paint the bars (bar-string)
-4. Write the Text
-
-
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
diff --git a/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode b/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode
deleted file mode 100644
index 147665392b6..00000000000
Binary files a/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode and /dev/null differ
diff --git a/htdocs/includes/barcode/php-barcode/php-barcode.php b/htdocs/includes/barcode/php-barcode/php-barcode.php
index b57edc63d05..56c53467c16 100644
--- a/htdocs/includes/barcode/php-barcode/php-barcode.php
+++ b/htdocs/includes/barcode/php-barcode/php-barcode.php
@@ -1,23 +1,8 @@
 <?php
-/* Copyright (C) 2001,2002,2003,2004 Folke Ashberg       <folke@ashberg.de>
- * Copyright (C) 2004-2009           Laurent Destailleur <eldy@users.sourceforge.net>
- *
- * PHP-Barcode 0.3pl2
- *
- * PHP-Barcode generates
- *   - Barcode-Images using libgd2 (png, jpg, gif)
- *   - HTML-Images (using 1x1 pixel and html-table)
- *   - silly Text-Barcodes
- *
- * PHP-Barcode encodes using
- *   - a built-in EAN-13/ISBN Encoder
- *   - genbarcode (by Folke Ashberg), a command line
- *     barcode-encoder which uses GNU-Barcode
- *     genbarcode can encode EAN-13, EAN-8, UPC, ISBN, 39, 128(a,b,c),
- *     I25, 128RAW, CBR, MSI, PLS
- *     genbarcode is available at www.ashberg.de/bar
- *
- * The newest version can be found at http://www.ashberg.de/bar
+/* Copyright (C) 2004-2011          Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010			Folke Ashberg: Some lines of code were inspired from work
+ *                                  of Folke Ashberg into PHP-Barcode 0.3pl2, available as GPL
+ *                                  source code at http://www.ashberg.de/bar.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,25 +33,10 @@ $text_color=Array(0,0,0);
 /* ******************************************************************** */
 /*                          FONT FILE                                   */
 /* ******************************************************************** */
-/* location the the ttf-font */
-/* the file arialbd.ttf isn't included! */
-
-/* SAMPLE1 :
- * use arialbd.ttf located in same directory like the script
- * which includes/requires php-barcode.php
- */
-//$font_loc=dirname($_SERVER["PATH_TRANSLATED"])."/"."arialbd.ttf";
-
-/* SAMPLE2 :
- * use font specified by full-path
- */
 if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
-/* Automatic-Detection of Font if running Windows
- * kick this lines if you don't need them! */
+// Automatic-Detection of Font if running Windows
 // DOL_CHANGE LDR
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])){
-	$font_loc=$_SERVER['WINDIR']."\Fonts\arialbd.ttf";
-}
+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
 if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
 
 
@@ -75,8 +45,8 @@ if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path t
 /* ******************************************************************** */
 /* location of 'genbarcode'
  * leave blank if you don't have them :(
- * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
- */
+* genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
+*/
 
 // DOL_CHANGE LDR
 if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
@@ -86,9 +56,104 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
 
 /* CONFIGURATION ENDS HERE */
 
-require("encode_bars.php"); /* build-in encoders */
 
-/*
+/**
+ * Built-In Encoders
+ * Part of PHP-Barcode 0.3pl1
+ *
+ * (C) 2001,2002,2003,2004 by Folke Ashberg <folke@ashberg.de>
+ *
+ * The newest version can be found at http://www.ashberg.de/bar
+ *
+ * This program is free software; you can 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/>.
+ *
+ */
+function barcode_gen_ean_sum($ean)
+{
+    $even=true; $esum=0; $osum=0;
+    for ($i=strlen($ean)-1;$i>=0;$i--)
+    {
+        if ($even) $esum+=$ean[$i];	else $osum+=$ean[$i];
+        $even=!$even;
+    }
+    return (10-((3*$esum+$osum)%10))%10;
+}
+
+/**
+ * barcode_encode_ean(code [, encoding])
+ *   encodes $ean with EAN-13 using builtin functions
+ *
+ *   return:
+ *    array[encoding] : the encoding which has been used (EAN-13)
+ *    array[bars]     : the bars
+ *    array[text]     : text-positioning info
+ */
+function barcode_encode_ean($ean, $encoding = "EAN-13")
+{
+    $digits=array(3211,2221,2122,1411,1132,1231,1114,1312,1213,3112);
+    $mirror=array("000000","001011","001101","001110","010011","011001","011100","010101","010110","011010");
+    $guards=array("9a1a","1a1a1","a1a");
+
+    $ean=trim($ean);
+    if (preg_match("/[^0-9]/i",$ean))
+    {
+        return array("text"=>"Invalid EAN-Code");
+    }
+    $encoding=strtoupper($encoding);
+    if ($encoding=="ISBN")
+    {
+        if (!preg_match("/^978/", $ean)) $ean="978".$ean;
+    }
+    if (preg_match("/^978/", $ean)) $encoding="ISBN";
+    if (strlen($ean)<12 || strlen($ean)>13)
+    {
+        return array("text"=>"Invalid $encoding Code (must have 12/13 numbers)");
+    }
+
+    $ean=substr($ean,0,12);
+    $eansum=barcode_gen_ean_sum($ean);
+    $ean.=$eansum;
+    $line=$guards[0];
+    for ($i=1;$i<13;$i++)
+    {
+        $str=$digits[$ean[$i]];
+        if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str;
+        if ($i==6) $line.=$guards[1];
+    }
+    $line.=$guards[2];
+
+    /* create text */
+    $pos=0;
+    $text="";
+    for ($a=0;$a<13;$a++)
+    {
+        if ($a>0) $text.=" ";
+        $text.="$pos:12:{$ean[$a]}";
+        if ($a==0) $pos+=12;
+        else if ($a==6) $pos+=12;
+        else $pos+=7;
+    }
+
+    return array(
+		"encoding" => $encoding,
+		"bars" => $line,
+		"text" => $text
+    );
+}
+
+
+/**
  * barcode_outimage(text, bars [, scale [, mode [, total_y [, space ]]]] )
  *
  *  Outputs an image using libgd
@@ -107,10 +172,8 @@ require("encode_bars.php"); /* build-in encoders */
  *		$space[left]  = 2 * $scale;
  *		$space[right] = 2 * $scale;
  */
-
-
-function barcode_outimage($text, $bars, $scale = 1, $mode = "png",
-	    $total_y = 0, $space = ''){
+function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '')
+{
     global $bar_color, $bg_color, $text_color;
     global $font_loc;
     /* set defaults */
@@ -118,49 +181,49 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png",
     $total_y=(int)($total_y);
     if ($total_y<1) $total_y=(int)$scale * 60;
     if (!$space)
-      $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+    $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
 
     /* count total width */
     $xpos=0;
     $width=true;
     for ($i=0;$i<strlen($bars);$i++){
-	$val=strtolower($bars[$i]);
-	if ($width){
-	    $xpos+=$val*$scale;
-	    $width=false;
-	    continue;
-	}
-	if (preg_match("/[a-z]/", $val)){
-	    /* tall bar */
-	    $val=ord($val)-ord('a')+1;
-	}
-	$xpos+=$val*$scale;
-	$width=true;
+        $val=strtolower($bars[$i]);
+        if ($width){
+            $xpos+=$val*$scale;
+            $width=false;
+            continue;
+        }
+        if (preg_match("/[a-z]/", $val)){
+            /* tall bar */
+            $val=ord($val)-ord('a')+1;
+        }
+        $xpos+=$val*$scale;
+        $width=true;
     }
 
     /* allocate the image */
     $total_x=( $xpos )+$space['right']+$space['right'];
     $xpos=$space['left'];
     if (!function_exists("imagecreate")){
-	print "You don't have the gd2 extension enabled<BR>\n";
-	print "<BR>\n";
-	print "<BR>\n";
-	print "Short HOWTO<BR>\n";
-	print "<BR>\n";
-	print "Debian: # apt-get install php4-gd2<BR>\n";
-	print "<BR>\n";
-	print "SuSE: ask YaST<BR>\n";
-	print "<BR>\n";
-	print "OpenBSD: # pkg_add /path/php4-gd-4.X.X.tgz (read output, you have to enable it)<BR>\n";
-	print "<BR>\n";
-	print "Windows: Download the PHP zip package from <A href=\"http://www.php.net/downloads.php\">php.net</A>, NOT the windows-installer, unzip the php_gd2.dll to C:\PHP (this is the default install dir) and uncomment 'extension=php_gd2.dll' in C:\WINNT\php.ini (or where ever your os is installed)<BR>\n";
-	print "<BR>\n";
-	print "<BR>\n";
-	print "The author of php-barcode will give not support on this topic!<BR>\n";
-	print "<BR>\n";
-	print "<BR>\n";
-	print "<A HREF=\"http://www.ashberg.de/bar/\">Folke Ashberg's OpenSource PHP-Barcode</A><BR>\n";
-	return "";
+        print "You don't have the gd2 extension enabled<BR>\n";
+        print "<BR>\n";
+        print "<BR>\n";
+        print "Short HOWTO<BR>\n";
+        print "<BR>\n";
+        print "Debian: # apt-get install php4-gd2<BR>\n";
+        print "<BR>\n";
+        print "SuSE: ask YaST<BR>\n";
+        print "<BR>\n";
+        print "OpenBSD: # pkg_add /path/php4-gd-4.X.X.tgz (read output, you have to enable it)<BR>\n";
+        print "<BR>\n";
+        print "Windows: Download the PHP zip package from <A href=\"http://www.php.net/downloads.php\">php.net</A>, NOT the windows-installer, unzip the php_gd2.dll to C:\PHP (this is the default install dir) and uncomment 'extension=php_gd2.dll' in C:\WINNT\php.ini (or where ever your os is installed)<BR>\n";
+        print "<BR>\n";
+        print "<BR>\n";
+        print "The author of php-barcode will give not support on this topic!<BR>\n";
+        print "<BR>\n";
+        print "<BR>\n";
+        print "<A HREF=\"http://www.ashberg.de/bar/\">Folke Ashberg's OpenSource PHP-Barcode</A><BR>\n";
+        return "";
     }
     $im=imagecreate($total_x, $total_y);
     /* create two images */
@@ -174,160 +237,62 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png",
     /* paint the bars */
     $width=true;
     for ($i=0;$i<strlen($bars);$i++){
-	$val=strtolower($bars[$i]);
-	if ($width){
-	    $xpos+=$val*$scale;
-	    $width=false;
-	    continue;
-	}
-	if (preg_match("/[a-z]/", $val)){
-	    /* tall bar */
-	    $val=ord($val)-ord('a')+1;
-	    $h=$height2;
-	} else $h=$height;
-	imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
-	$xpos+=$val*$scale;
-	$width=true;
+        $val=strtolower($bars[$i]);
+        if ($width){
+            $xpos+=$val*$scale;
+            $width=false;
+            continue;
+        }
+        if (preg_match("/[a-z]/", $val)){
+            /* tall bar */
+            $val=ord($val)-ord('a')+1;
+            $h=$height2;
+        } else $h=$height;
+        imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
+        $xpos+=$val*$scale;
+        $width=true;
     }
     /* write out the text */
     global $_SERVER;
     $chars=explode(" ", $text);
     reset($chars);
     while (list($n, $v)=each($chars)){
-	if (trim($v)){
-	    $inf=explode(":", $v);
-	    $fontsize=$scale*($inf[1]/1.8);
-	    $fontheight=$total_y-($fontsize/2.7)+2;
-	    @imagettftext($im, $fontsize, 0, $space['left']+($scale*$inf[0])+2,
-	    $fontheight, $col_text, $font_loc, $inf[2]);
-	}
+        if (trim($v)){
+            $inf=explode(":", $v);
+            $fontsize=$scale*($inf[1]/1.8);
+            $fontheight=$total_y-($fontsize/2.7)+2;
+            @imagettftext($im, $fontsize, 0, $space['left']+($scale*$inf[0])+2,
+            $fontheight, $col_text, $font_loc, $inf[2]);
+        }
     }
 
-	// DOLCHANGE LDR
+    // DOLCHANGE LDR
     global $filebarcode;
 
     /* output the image */
     $mode=strtolower($mode);
     if ($mode=='jpg' || $mode=='jpeg'){
-	header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
-	imagejpeg($im);
+        header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
+        imagejpeg($im);
     } else if ($mode=='gif'){
-	header("Content-Type: image/gif; name=\"barcode.gif\"");
-	imagegif($im);
+        header("Content-Type: image/gif; name=\"barcode.gif\"");
+        imagegif($im);
 
-	// Begin DOLCHANGE LDR
+        // Begin DOLCHANGE LDR
     } else if (! empty($filebarcode))
     {
-		imagepng($im,$filebarcode);
-	// End DOLCHANGE LDR
+        imagepng($im,$filebarcode);
+        // End DOLCHANGE LDR
 
     } else {
-	header("Content-Type: image/png; name=\"barcode.png\"");
-	imagepng($im);
+        header("Content-Type: image/png; name=\"barcode.png\"");
+        imagepng($im);
     }
 }
 
-/*
- * barcode_outtext(code, bars)
- *
- *  Returns (!) a barcode as plain-text
- *  ATTENTION: this is very silly!
- *
- *    text   : the text-line (<position>:<font-size>:<character> ...)
- *    bars   : where to place the bars  (<space-width><bar-width><space-width><bar-width>...)
- */
 
-function barcode_outtext($code,$bars){
-    $width=true;
-    $xpos=$heigh2=0;
-    $bar_line="";
-    for ($i=0;$i<strlen($bars);$i++){
-	$val=strtolower($bars[$i]);
-	if ($width){
-	    $xpos+=$val;
-	    $width=false;
-	    for ($a=0;$a<$val;$a++) $bar_line.="-";
-	    continue;
-	}
-	if (preg_match("/[a-z]/", $val)){
-	    $val=ord($val)-ord('a')+1;
-	    $h=$heigh2;
-	    for ($a=0;$a<$val;$a++) $bar_line.="I";
-	} else for ($a=0;$a<$val;$a++) $bar_line.="#";
-	$xpos+=$val;
-	$width=true;
-    }
-    return $bar_line;
-}
-
-/*
- * barcode_outhtml(text, bars [, scale [, total_y [, space ]]] )
- *
- *  returns(!) HTML-Code for barcode-image using html-code (using a table and with black.png and white.png)
- *
- *    text   : the text-line (<position>:<font-size>:<character> ...)
- *    bars   : where to place the bars  (<space-width><bar-width><space-width><bar-width>...)
- *    scale  : scale factor ( 1 < scale < unlimited (scale 50 will produce
- *                                                   5400x300 pixels when
- *                                                   using EAN-13!!!))
- *    total_y: the total height of the image ( default: scale * 60 )
- *    space  : space
- *             default:
- *		$space[top]   = 2 * $scale;
- *		$space[bottom]= 2 * $scale;
- *		$space[left]  = 2 * $scale;
- *		$space[right] = 2 * $scale;
- */
-
-
-
-function barcode_outhtml($code, $bars, $scale = 1, $total_y = 0, $space = ''){
-    /* set defaults */
-    $total_y=(int)($total_y);
-    if ($scale<1) $scale=2;
-    if ($total_y<1) $total_y=(int)$scale * 60;
-    if (!$space)
-      $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
-
-
-    /* generate html-code */
-    $height=round($total_y-($scale*10));
-    $height2=round($total_y)-$space['bottom'];
-    $out=
-      '<Table border=0 cellspacing=0 cellpadding=0 bgcolor="white">'."\n".
-      '<TR><TD><img src=white.png height="'.$space['top'].'" width=1></TD></TR>'."\n".
-      '<TR><TD>'."\n".
-      '<IMG src=white.png height="'.$height2.'" width="'.$space['left'].'">';
-
-    $width=true;
-    for ($i=0;$i<strlen($bars);$i++){
-	$val=strtolower($bars[$i]);
-	if ($width){
-	    $w=$val*$scale;
-	    if ($w>0) $out.="<IMG src=white.png height=\"$total_y\" width=\"$w\" align=top>";
-	    $width=false;
-	    continue;
-	}
-	if (preg_match("/[a-z]/", $val)){
-	    //hoher strich
-	    $val=ord($val)-ord('a')+1;
-	    $h=$height2;
-	}else $h=$height;
-	$w=$val*$scale;
-	if ($w>0) $out.='<IMG src="black.png" height="'.$h.'" width="'.$w.'" align=top>';
-	$width=true;
-    }
-    $out.=
-      '<IMG src=white.png height="'.$height2.'" width=".'.$space['right'].'">'.
-      '</TD></TR>'."\n".
-      '<TR><TD><img src="white.png" height="'.$space['bottom'].'" width="1"></TD></TR>'."\n".
-      '</TABLE>'."\n";
-    //for ($i=0;$i<strlen($bars);$i+=2) print $line[$i]."<B>".$line[$i+1]."</B>&nbsp;";
-    return $out;
-}
-
-
-/* barcode_encode_genbarcode(code, encoding)
+/**
+ * barcode_encode_genbarcode(code, encoding)
  *   encodes $code with $encoding using genbarcode
  *
  *   return:
@@ -335,7 +300,8 @@ function barcode_outhtml($code, $bars, $scale = 1, $total_y = 0, $space = ''){
  *    array[bars]     : the bars
  *    array[text]     : text-positioning info
  */
-function barcode_encode_genbarcode($code,$encoding){
+function barcode_encode_genbarcode($code,$encoding)
+{
     global $genbarcode_loc;
     /* delete EAN-13 checksum */
     if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code,0,12);
@@ -343,28 +309,29 @@ function barcode_encode_genbarcode($code,$encoding){
     $encoding=preg_replace("/[\\\|]/", "_", $encoding);
     $code=preg_replace("/[\\\|]/", "_", $code);
     $cmd=$genbarcode_loc." \""
-	.str_replace("\"", "\\\"",$code)."\" \""
-	.str_replace("\"", "\\\"",strtoupper($encoding))."\"";
+    .str_replace("\"", "\\\"",$code)."\" \""
+    .str_replace("\"", "\\\"",strtoupper($encoding))."\"";
     //print "'$cmd'<BR>\n";
     $fp=popen($cmd, "r");
     if ($fp){
-	$bars=fgets($fp, 1024);
-	$text=fgets($fp, 1024);
-	$encoding=fgets($fp, 1024);
-	pclose($fp);
+        $bars=fgets($fp, 1024);
+        $text=fgets($fp, 1024);
+        $encoding=fgets($fp, 1024);
+        pclose($fp);
     } else return false;
     $ret=array(
 		"encoding" => trim($encoding),
 		"bars" => trim($bars),
 		"text" => trim($text)
-	      );
+    );
     if (!$ret['encoding']) return false;
     if (!$ret['bars']) return false;
     if (!$ret['text']) return false;
     return $ret;
 }
 
-/* barcode_encode(code, encoding)
+/**
+ * barcode_encode(code, encoding)
  *   encodes $code with $encoding using genbarcode OR built-in encoder
  *   if you don't have genbarcode only EAN-13/ISBN is possible
  *
@@ -388,43 +355,45 @@ function barcode_encode_genbarcode($code,$encoding){
  *    array[bars]     : the bars
  *    array[text]     : text-positioning info
  */
-function barcode_encode($code,$encoding){
+function barcode_encode($code,$encoding)
+{
     global $genbarcode_loc;
     if (
-		((preg_match("/^ean$/i", $encoding)
-		 && ( strlen($code)==12 || strlen($code)==13)))
+    ((preg_match("/^ean$/i", $encoding)
+    && ( strlen($code)==12 || strlen($code)==13)))
 
-		|| (($encoding) && (preg_match("/^isbn$/i", $encoding))
-		 && (( strlen($code)==9 || strlen($code)==10) ||
-		 (((preg_match("/^978/", $code) && strlen($code)==12) ||
-		  (strlen($code)==13)))))
+    || (($encoding) && (preg_match("/^isbn$/i", $encoding))
+    && (( strlen($code)==9 || strlen($code)==10) ||
+    (((preg_match("/^978/", $code) && strlen($code)==12) ||
+    (strlen($code)==13)))))
 
-		|| (( !isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding) ))
-		 && (preg_match("/^[0-9]{12,13}$/", $code)))
+    || (( !isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding) ))
+    && (preg_match("/^[0-9]{12,13}$/", $code)))
 
-		){
-	/* use built-in EAN-Encoder */
-	$bars=barcode_encode_ean($code, $encoding);
+    ){
+        /* use built-in EAN-Encoder */
+        $bars=barcode_encode_ean($code, $encoding);
     } else if (file_exists($genbarcode_loc)){
-	/* use genbarcode */
-	$bars=barcode_encode_genbarcode($code, $encoding);
+        /* use genbarcode */
+        $bars=barcode_encode_genbarcode($code, $encoding);
     } else {
-	print "php-barcode needs an external programm for encodings other then EAN/ISBN<BR>\n";
-	print "<UL>\n";
-	print "<LI>download gnu-barcode from <A href=\"http://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
-	print "<LI>compile and install them\n";
-	print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";
-	print "<LI>compile and install them\n";
-	print "<LI>specify path the genbarcode in php-barcode.php\n";
-	print "</UL>\n";
-	print "<BR>\n";
-	print "<A HREF=\"http://www.ashberg.de/bar/\">Folke Ashberg's OpenSource PHP-Barcode</A><BR>\n";
-	return false;
+        print "php-barcode needs an external programm for encodings other then EAN/ISBN<BR>\n";
+        print "<UL>\n";
+        print "<LI>download gnu-barcode from <A href=\"http://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
+        print "<LI>compile and install them\n";
+        print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";
+        print "<LI>compile and install them\n";
+        print "<LI>specify path the genbarcode in php-barcode.php\n";
+        print "</UL>\n";
+        print "<BR>\n";
+        print "<A HREF=\"http://www.ashberg.de/bar/\">Folke Ashberg's OpenSource PHP-Barcode</A><BR>\n";
+        return false;
     }
     return $bars;
 }
 
-/* barcode_print(code [, encoding [, scale [, mode ]]] );
+/**
+ * barcode_print(code [, encoding [, scale [, mode ]]] );
  *
  *  encodes and prints a barcode
  *
@@ -433,23 +402,24 @@ function barcode_encode($code,$encoding){
  *    array[bars]     : the bars
  *    array[text]     : text-positioning info
  */
-function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png" ){
+function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png" )
+{
+    // DOLCHANGE LDR Add log
+    dol_syslog("php-barcode.php:barcode_print $code $encoding $scale $mode");
 
-	// DOLCHANGE LDR Add log
-	dol_syslog("php-barcode.php:barcode_print $code $encoding $scale $mode");
-
-	$bars=barcode_encode($code,$encoding);
-	if (!$bars)
-	{
-		// DOLCHANGE LDR Return error message instead of array
-		$error='Bad Value '.$code.' for encoding '.$encoding;
-		dol_syslog('php-barcode.php:barcode_print '.$error, LOG_ERR);
-		return $error;
-	}
+    $bars=barcode_encode($code,$encoding);
+    if (!$bars)
+    {
+        // DOLCHANGE LDR Return error message instead of array
+        $error='Bad Value '.$code.' for encoding '.$encoding;
+        dol_syslog('php-barcode.php:barcode_print '.$error, LOG_ERR);
+        return $error;
+    }
     if (!$mode) $mode="png";
-    if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
-    elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
-    else barcode_outimage($bars['text'],$bars['bars'],$scale, $mode);
+    //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
+    //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
+    //else
+    barcode_outimage($bars['text'],$bars['bars'],$scale, $mode);
     return $bars;
 }
 
diff --git a/htdocs/includes/barcode/php-barcode/white.png b/htdocs/includes/barcode/php-barcode/white.png
deleted file mode 100644
index 6085731ad19..00000000000
Binary files a/htdocs/includes/barcode/php-barcode/white.png and /dev/null differ