Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
This commit is contained in:
commit
ceda05a879
@ -3802,6 +3802,7 @@ class Form
|
|||||||
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';
|
||||||
$sql .= ' WHERE entity IN ('.getEntity('invoice').')';
|
$sql .= ' WHERE entity IN ('.getEntity('invoice').')';
|
||||||
$sql .= ' AND situation_counter >= 1';
|
$sql .= ' AND situation_counter >= 1';
|
||||||
|
$sql .= ' AND type <> 2';
|
||||||
$sql .= ' ORDER by situation_cycle_ref, situation_counter desc';
|
$sql .= ' ORDER by situation_cycle_ref, situation_counter desc';
|
||||||
$resql = $this->db->query($sql);
|
$resql = $this->db->query($sql);
|
||||||
if ($resql && $this->db->num_rows($resql) > 0) {
|
if ($resql && $this->db->num_rows($resql) > 0) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user