Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2015-12-17 14:01:34 +01:00
commit 92343901d6

View File

@ -105,7 +105,10 @@ if ($_socid > 0)
print '<option value="'.$i.'"' ;
if($i == $objsoc->price_level)
print 'selected';
print '>'.$i.'</option>';
print '>'.$i;
$keyforlabel='PRODUIT_MULTIPRICES_LABEL'.$i;
if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
print '</option>';
}
print '</select>';
print '</td></tr>';