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

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/fourn/class/fournisseur.product.class.php
This commit is contained in:
Laurent Destailleur 2019-12-17 12:52:12 +01:00
commit 3207add2a6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -395,7 +395,6 @@ class ProductFournisseur extends Product
return -2; return -2;
} }
} }
else else
{ {
dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG); dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
@ -438,11 +437,11 @@ class ProductFournisseur extends Product
$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'"); $sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
$sql .= ")"; $sql .= ")";
$idinserted = 0; $this->product_fourn_price_id = 0;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$idinserted = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price"); $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX . "product_fournisseur_price");
} }
else { else {
$error++; $error++;
@ -450,6 +449,7 @@ class ProductFournisseur extends Product
if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) { if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
// Add record into log table // Add record into log table
// $this->product_fourn_price_id must be set
$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrenc, $multicurrency_code); $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrenc, $multicurrency_code);
if ($result < 0) { if ($result < 0) {
$error++; $error++;
@ -465,7 +465,6 @@ class ProductFournisseur extends Product
if (empty($error)) { if (empty($error)) {
$this->db->commit(); $this->db->commit();
$this->product_fourn_price_id = $idinserted;
return $this->product_fourn_price_id; return $this->product_fourn_price_id;
} else { } else {
$this->db->rollback(); $this->db->rollback();

8
htdocs/projet/tasks/document.php
View File

@ -284,9 +284,11 @@ if ($object->id > 0)
$morehtmlref.='<br>'; $morehtmlref.='<br>';
// Third party // Third party
$morehtmlref.=$langs->trans("ThirdParty").': '; $morehtmlref .= $langs->trans("ThirdParty") . ': ';
$morehtmlref.=$projectstatic->thirdparty->getNomUrl(1); if (is_object($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0) {
$morehtmlref.='</div>'; $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
}
$morehtmlref .= '</div>';
} }
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param); dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);