Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0
Conflicts: htdocs/commande/stats/index.php
This commit is contained in:
commit
79c68c6132
@ -283,7 +283,7 @@ if ($mode == 'customer')
|
|||||||
if ($mode == 'supplier')
|
if ($mode == 'supplier')
|
||||||
{
|
{
|
||||||
$cat_type = Categorie::TYPE_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 '<tr><td>'.$cat_label.'</td><td>';
|
||||||
print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
|
print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user