lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
This commit is contained in:
Laurent Destailleur 2020-10-14 20:15:19 +02:00
commit d283e8f649
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/stats/cabyprodserv.php
View File

@ -254,9 +254,8 @@ if ($modecompta == 'CREANCES-DETTES')
{
$sql .= " AND cp.fk_product is null";
}
elseif ($selected_cat && $selected_cat != -2) { // Into a specific category
if ($subcat)
{
elseif ($selected_cat) { // Into a specific category
if ($subcat) {
$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
$listofcatsql = "";