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 11.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-05 12:51:54 +01:00
commit 2cf970f617
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/company.lib.php
View File

@ -207,8 +207,12 @@ function societe_prepare_head(Societe $object)
$sql = "SELECT COUNT(n.rowid) as nb"; $sql = "SELECT COUNT(n.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n"; $sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
$sql .= " WHERE fk_soc = ".$object->id; $sql .= " WHERE n.fk_soc = ".$object->id;
$sql .= " AND status = ".$servicestatus; if (empty($conf->stripe->enabled)) {
$sql .= " AND n.stripe_card_ref IS NULL";
} else {
$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".$servicestatus."))";
}
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)