diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php index e89e9a79194..a85d8bad2d7 100644 --- a/htdocs/core/lib/ticket.lib.php +++ b/htdocs/core/lib/ticket.lib.php @@ -834,7 +834,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no $filePath = DOL_DATA_ROOT . '/'. $doc->filepath . '/'. $doc->filename; $mime = dol_mimetype($filePath); $file = $actionstatic->id.'/'.$doc->filename; - $thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename,'.')).'_mini'.substr($doc->filename, strrpos($doc->filename,'.')); + $thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename, '.')).'_mini'.substr($doc->filename, strrpos($doc->filename, '.')); $doclink = dol_buildpath('document.php', 1).'?modulepart=actions&attachment=0&file='.urlencode($file).'&entity='.$conf->entity; $viewlink = dol_buildpath('viewimage.php', 1).'?modulepart=actions&file='.urlencode($thumb).'&entity='.$conf->entity; @@ -881,7 +881,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no /** - * @var $object ActionComm + * @var ActionComm $object ActionComm * @return array */ function getTicketActionCommEcmList($object) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index de14a5621a2..4d8afaad9aa 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2093,7 +2093,6 @@ class Product extends CommonObject $resql = $this->db->query($sql); if ($resql) { - unset($this->oldcopy); if ($this->db->num_rows($resql) > 0) { diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index f0bedbcd7f5..e1940864dd0 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -269,7 +269,6 @@ if (empty($reshook)) $resql = $db->query("SELECT * FROM " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields WHERE fk_object = " . $object->product_fourn_price_id); // Insert a new extrafields row, if none exists if ($db->num_rows($resql) != 1) { - $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields (fk_object, "; foreach ($extrafield_values as $key => $value) { $sql .= str_replace('options_', '', $key) . ', '; @@ -291,7 +290,7 @@ if (empty($reshook)) // Execute the sql command from above $db->query($sql); - + $newprice = price2num(GETPOST("price", "alpha")); if ($conf->multicurrency->enabled) diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php index 7451b7ba920..94b2830ffdf 100644 --- a/test/phpunit/UserTest.php +++ b/test/phpunit/UserTest.php @@ -192,7 +192,7 @@ class UserTest extends PHPUnit\Framework\TestCase $newlocalobject=new User($this->savdb); $newlocalobject->initAsSpecimen(); $this->changeProperties($newlocalobject); - $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected + $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected return $localobject; } @@ -309,7 +309,7 @@ class UserTest extends PHPUnit\Framework\TestCase */ public function changeProperties(&$localobject) { - $localobject->note='New note after update'; + $localobject->note_private='New note after update'; } /**