diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index db662b6d9e4..e421c17a470 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -298,7 +298,7 @@ if ($conf->product->enabled || $conf->product->service)
 	{
 		$disabled=1;
 		$titleno=$langs->trans("NoBarcodeNumberingTemplateDefined");
-		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font><br>';
+		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
 	}
 	if (empty($nbno))
 	{
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 778723c5f3b..eaaa6f349c4 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -63,8 +63,6 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
  * @param	string	$encoding	Encoding
  * @param	integer	$scale		Scale
  * @param	string	$mode		'png' or 'jpg' ...
- *
- *
  * @return	array	$bars		array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
  */
 function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png")
@@ -116,8 +114,7 @@ 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))
 
     || (($encoding) && (preg_match("/^isbn$/i", $encoding))
     && (( strlen($code)==9 || strlen($code)==10) ||
@@ -140,7 +137,7 @@ function barcode_encode($code,$encoding)
     }
     else
     {
-        print "barcode_encode needs an external programm for encodings other then EAN/ISBN<BR>\n";
+        print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<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";
@@ -151,6 +148,7 @@ function barcode_encode($code,$encoding)
         print "<BR>\n";
         return false;
     }
+
     return $bars;
 }
 
@@ -178,7 +176,7 @@ function barcode_gen_ean_sum($ean)
  *
  * @param	string	$ean		Code
  * @param	string	$encoding	Encoding
- * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
+ * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info, 'error': error message if error)
  */
 function barcode_encode_ean($ean, $encoding = "EAN-13")
 {
@@ -189,7 +187,7 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
     $ean=trim($ean);
     if (preg_match("/[^0-9]/i",$ean))
     {
-        return array("text"=>"Invalid EAN-Code");
+        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
     }
     $encoding=strtoupper($encoding);
     if ($encoding=="ISBN")
@@ -199,7 +197,7 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
     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)");
+        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
     }
 
     $ean=substr($ean,0,12);
@@ -227,7 +225,8 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
     }
 
     return array(
-		"encoding" => $encoding,
+        "error" => '',
+        "encoding" => $encoding,
 		"bars" => $line,
 		"text" => $text
     );
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cc596bae7e8..5920ad01141 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1711,3 +1711,5 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+ModelModulesProduct=Templates for product documents
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
\ No newline at end of file
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 15b113ffffb..4a142e909fe 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -323,7 +323,7 @@ $form=new Form($db);
  */
 $dirproduct=array('/core/modules/product/');
 
-print load_fiche_titre($langs->trans("ProductCodeChecker"));
+print load_fiche_titre($langs->trans("ProductCodeChecker"), '', '');
 
 print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">'."\n";
@@ -400,9 +400,6 @@ foreach ($dirproduct as $dirroot)
 print '</table>';
 
 
-print '<br>';
-print_titre($langs->trans("ModelModulesProduct"));
-
 // Load array def with activated templates
 $def = array();
 $sql = "SELECT nom";
@@ -414,135 +411,142 @@ if ($resql)
 {
 	$i = 0;
 	$num_rows=$db->num_rows($resql);
-	while ($i < $num_rows)
+	if ($num_rows > 0)
 	{
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
+	    print '<br>';
+	    print load_fiche_titre($langs->trans("ModelModulesProduct"), '', '');
+
+    	while ($i < $num_rows)
+    	{
+    		$array = $db->fetch_array($resql);
+    		array_push($def, $array[0]);
+    		$i++;
+    	}
+        
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td width="140">'.$langs->trans("Name").'</td>';
+        print '<td>'.$langs->trans("Description").'</td>';
+        print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
+        print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
+        print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
+        print "</tr>\n";
+        
+        $var=true;
+        foreach ($dirproduct as $dirroot)
+        {
+        	$dir = dol_buildpath($dirroot.'core/modules/product/doc/',0);
+        	$handle=@opendir($dir);
+        	if (is_resource($handle))
+        	{
+        		while (($file = readdir($handle))!==false)
+        		{
+        			if (preg_match('/\.modules\.php$/i',$file))
+        			{
+        				$name = substr($file, 4, dol_strlen($file) -16);
+        				$classname = substr($file, 0, dol_strlen($file) -12);
+        
+        			    try {
+                			dol_include_once($dirroot.'core/modules/product/doc/'.$file);
+            			}
+            			catch(Exception $e)
+            			{
+            			    dol_syslog($e->getMessage(), LOG_ERR);
+            			}
+        
+            			$module = new $classname($db);
+        
+        				$modulequalified=1;
+        				if (! empty($module->version)) {
+        					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+        					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+        				}
+        
+        				if ($modulequalified)
+        				{
+        					$var = !$var;
+        					print '<tr '.$bc[$var].'><td width="100">';
+        					print $module->name;
+        					print "</td><td>\n";
+        					if (method_exists($module,'info')) print $module->info($langs);
+        					else print $module->description;
+        					print '</td>';
+        
+        					// Activate / Disable
+        					if (in_array($name, $def))
+        					{
+        						print "<td align=\"center\">\n";
+        						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
+        						print img_picto($langs->trans("Enabled"),'switch_on');
+        						print '</a>';
+        						print "</td>";
+        					}
+        					else
+        					{
+        						if (versioncompare($module->phpmin,versionphparray()) > 0)
+        						{
+        							print "<td align=\"center\">\n";
+        							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
+        							print "</td>";
+        						}
+        						else
+        						{
+        							print "<td align=\"center\">\n";
+        							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+        							print "</td>";
+        						}
+        					}
+        
+        					// Info
+        					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+        					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+        					if ($module->type == 'pdf')
+        					{
+        						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+        					}
+        					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+        					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+        
+        					print '<td align="center" class="nowrap">';
+        					print $form->textwithpicto('',$htmltooltip,1,0);
+        					print '</td>';
+        
+        					// Preview
+        					print '<td align="center" class="nowrap">';
+        					if ($module->type == 'pdf')
+        					{
+        						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+        					}
+        					else
+        					{
+        						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
+        					}
+        					print $linkspec;
+        					print '</td>';
+        
+        					print "</tr>\n";
+        				}
+        			}
+        		}
+        		closedir($handle);
+        	}
+        }
+        print '</table>';
 	}
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td width="140">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
-
-$var=true;
-foreach ($dirproduct as $dirroot)
-{
-	$dir = dol_buildpath($dirroot.'core/modules/product/doc/',0);
-	$handle=@opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle))!==false)
-		{
-			if (preg_match('/\.modules\.php$/i',$file))
-			{
-				$name = substr($file, 4, dol_strlen($file) -16);
-				$classname = substr($file, 0, dol_strlen($file) -12);
-
-			    try {
-        			dol_include_once($dirroot.'core/modules/product/doc/'.$file);
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$module = new $classname($db);
-
-				$modulequalified=1;
-				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-				}
-
-				if ($modulequalified)
-				{
-					$var = !$var;
-					print '<tr '.$bc[$var].'><td width="100">';
-					print $module->name;
-					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
-					else print $module->description;
-					print '</td>';
-
-					// Activate / Disable
-					if (in_array($name, $def))
-					{
-						print "<td align=\"center\">\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
-						print img_picto($langs->trans("Enabled"),'switch_on');
-						print '</a>';
-						print "</td>";
-					}
-					else
-					{
-						if (versioncompare($module->phpmin,versionphparray()) > 0)
-						{
-							print "<td align=\"center\">\n";
-							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
-							print "</td>";
-						}
-						else
-						{
-							print "<td align=\"center\">\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-							print "</td>";
-						}
-					}
-
-					// Info
-					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-					if ($module->type == 'pdf')
-					{
-						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
-					}
-					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-
-					print '<td align="center" class="nowrap">';
-					print $form->textwithpicto('',$htmltooltip,1,0);
-					print '</td>';
-
-					// Preview
-					print '<td align="center" class="nowrap">';
-					if ($module->type == 'pdf')
-					{
-						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-					}
-					else
-					{
-						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
-					}
-					print $linkspec;
-					print '</td>';
-
-					print "</tr>\n";
-				}
-			}
-		}
-		closedir($handle);
-	}
-}
-print '</table>';
-
+    
+    
 /*
  * Other conf
  */
 
 print "<br>";
 
-print load_fiche_titre($langs->trans("ProductOtherConf"));
+print load_fiche_titre($langs->trans("ProductOtherConf"), '', '');
 
 
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index bdfdf986d17..283d94b97bd 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -36,6 +36,7 @@
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
@@ -80,11 +81,21 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
+$object = new Product($db);
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Product($db);
-	$object->fetch($id, $ref);
+    $result = $object->fetch($id, $ref);
+
+    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+
+    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+    {
+        if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+        else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+    }
 }
+$modulepart='product';
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas");
@@ -769,6 +780,7 @@ else $title = $langs->trans('ProductServiceCard');
 llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
 if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
 
@@ -1678,28 +1690,6 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 {
     print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
 }
-print '<div class="fichecenter"><div class="fichehalfleft">';
-print '<a name="builddoc"></a>'; // ancre
-
-/*
- * Documents generes
- */
-$filedir=$conf->product->dir_output.'/product/'.$object->id;
-
-$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-$genallowed=$user->rights->produit->creer;
-$delallowed=$user->rights->produit->supprimer;
-
-$var=true;
-
-$somethingshown=$formfile->show_documents('product',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
-
-print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-print '</div></div></div>';
-
-print '<br><br>';
 
 
 /* ************************************************************************** */
@@ -1872,16 +1862,40 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
         print $html;
         print '</table>';
 		
-		dol_fiche_end();
-
         print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
         print '</div>';
 
+        dol_fiche_end();
+
         print '</form>';
     }
 }
 
 
+/*
+ * Documents generes
+ */
+if ($action == '' || $action == 'view')
+{
+    print '<div class="fichecenter"><div class="fichehalfleft">';
+    print '<a name="builddoc"></a>'; // ancre
+
+    $filedir=$upload_dir;
+
+    $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+    $genallowed=$user->rights->produit->creer;
+    $delallowed=$user->rights->produit->supprimer;
+
+    $var=true;
+    
+    $somethingshown=$formfile->show_documents($modulepart,$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
+
+    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+    print '</div></div></div>';
+}
+
+
 llxFooter();
 $db->close();
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 8a4c68990c6..177c3bd2f81 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -211,7 +211,6 @@ if ($object->id)
     
     dol_fiche_end();
 
-    $modulepart = 'produit';
     $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index d14ccc6f8d4..949884df6e9 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify