Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0

Conflicts:
	htdocs/commande/stats/index.php
This commit is contained in:
Laurent Destailleur 2021-01-28 00:23:44 +01:00
commit 79c68c6132

View File

@ -283,7 +283,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$cat_type = Categorie::TYPE_SUPPLIER;
$cat_label = $langs->trans("Supplier").' '.lcfirst($langs->trans("Customer"));
$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
}
print '<tr><td>'.$cat_label.'</td><td>';
print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);