Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into dev…

…elop-work-on-warehouse-status
Dolibarr · Dec 7, 2016 · b8a1bc1 · b8a1bc1
2 parents 085d44e + ea3e2e4
commit b8a1bc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
@@ -2484,8 +2484,8 @@
 	$htmltext='';
 	if (GETPOST('fac_rec','int') > 0)
 	{
-    	$dateexample=dol_now();
-    	if (! empty($datefacture?$datefacture:$dateinvoice)) $dateexample=($datefacture?$datefacture:$dateinvoice);
+    	$dateexample=($datefacture ? $datefacture : $dateinvoice);
+    	if (empty($dateexample)) $dateexample=dol_now();
     	$substitutionarray=array(
     	    '__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')',
     	    '__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ttc).')',

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
@@ -977,7 +977,7 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql
                             {
                                 //var_dump($objMod->dictionaries['tabname']);
                                 $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp=0;
-                                foreach($objMod->dictionaries['tabname'] as $val)        { $nbtabname++; $taborder[] = count($tabname)+1; $tabname[] = $val; }
+                                foreach($objMod->dictionaries['tabname'] as $val)        { $nbtabname++; $taborder[] = max($taborder)+1; $tabname[] = $val; }
                                 foreach($objMod->dictionaries['tablib'] as $val)         { $nbtablib++; $tablib[] = $val; }
                                 foreach($objMod->dictionaries['tabsql'] as $val)         { $nbtabsql++; $tabsql[] = $val; }
                                 foreach($objMod->dictionaries['tabsqlsort'] as $val)     { $nbtabsqlsort++; $tabsqlsort[] = $val; }

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
@@ -867,12 +867,12 @@
 		print '<tr '.$bc[$var].' height="'.$height.'">';
 
 		$i++;
-
+		
 		$entity=(! empty($objimport->array_import_entities[0][$code])?$objimport->array_import_entities[0][$code]:$objimport->array_import_icon[0]);
 		$tablealias=preg_replace('/(\..*)$/i','',$code);
 		$tablename=$objimport->array_import_tables[0][$tablealias];
-		$entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity;
-		$entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$entity;
+		$entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$objimport->array_import_icon[0];
+		$entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$objimport->array_import_label[0];
 
 		print '<td class="nowrap" style="font-weight: normal">=>'.img_object('',$entityicon).' '.$langs->trans($entitylang).'</td>';
 		print '<td style="font-weight: normal">';