From 7571760fddab9c368de808e29291537a2db0ddd2 Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Fri, 16 Nov 2018 11:31:23 +0100 Subject: [PATCH] fix errors during cherry picking --- htdocs/core/modules/facture/mod_facture_mars.php | 6 ++++-- htdocs/core/modules/facture/mod_facture_mercure.php | 3 +++ htdocs/core/modules/facture/mod_facture_terre.php | 6 ++++-- htdocs/product/card.php | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php index 5dbc1dd2b7a..a9ae6a0e1e8 100644 --- a/htdocs/core/modules/facture/mod_facture_mars.php +++ b/htdocs/core/modules/facture/mod_facture_mars.php @@ -164,7 +164,8 @@ class mod_facture_mars extends ModeleNumRefFactures $sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-%'"; - $sql.= " AND entity IN (".getEntity('invoicenumber').")"; + $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")"; + $resql=$db->query($sql); dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); if ($resql) @@ -187,7 +188,8 @@ class mod_facture_mars extends ModeleNumRefFactures $sql = "SELECT facnumber as ref"; $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'"; - $sql.= " AND entity IN (".getEntity('invoicenumber').")"; + $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")"; + dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); $resql=$db->query($sql); if ($resql) diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index d1ad13affa7..73c8984d336 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -194,6 +194,9 @@ class mod_facture_mercure extends ModeleNumRefFactures $where=''; //if ($facture->type == 2) $where.= " AND type = 2"; //else $where.=" AND type != 2"; + + // Get entities + $entity = getEntity('invoicenumber', 1, $invoice); $numFinal=get_next_value($db,$mask,'facture','facnumber',$where,$objsoc,$invoice->date,$mode,false,null,$entity); if (! preg_match('/([0-9])+/',$numFinal)) $this->error = $numFinal; diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index 3d323ba2c6b..474c4c20ac2 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -179,7 +179,8 @@ class mod_facture_terre extends ModeleNumRefFactures $sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-%'"; - $sql.= " AND entity IN (".getEntity('invoicenumber').")"; + $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")"; + $resql=$db->query($sql); dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); if ($resql) @@ -202,7 +203,8 @@ class mod_facture_terre extends ModeleNumRefFactures $sql = "SELECT facnumber as ref"; $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'"; - $sql.= " AND entity IN (".getEntity('invoicenumber').")"; + $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")"; + dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); $resql=$db->query($sql); if ($resql) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f4e4bb90937..f94c34d1804 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2053,7 +2053,7 @@ if ($action != 'create' && $action != 'edit') * All the "Add to" areas */ -if ( $object->id && ($action == '' || $action == 'view') && $object->status) +if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status) { //Variable used to check if any text is going to be printed $html = '';