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

wip

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-11-03 18:15:24 +01:00
parent 2da87bcdc7
commit b8202f6ed4
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/ticket.lib.php
View File

@ -834,7 +834,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$filePath = DOL_DATA_ROOT . '/'. $doc->filepath . '/'. $doc->filename; $filePath = DOL_DATA_ROOT . '/'. $doc->filepath . '/'. $doc->filename;
$mime = dol_mimetype($filePath); $mime = dol_mimetype($filePath);
$file = $actionstatic->id.'/'.$doc->filename; $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; $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; $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 * @return array
*/ */
function getTicketActionCommEcmList($object) function getTicketActionCommEcmList($object)

1
htdocs/product/class/product.class.php
View File

@ -2093,7 +2093,6 @@ class Product extends CommonObject
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
unset($this->oldcopy); unset($this->oldcopy);
if ($this->db->num_rows($resql) > 0) { if ($this->db->num_rows($resql) > 0) {

3
htdocs/product/fournisseurs.php
View File

@ -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); $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 // Insert a new extrafields row, if none exists
if ($db->num_rows($resql) != 1) { if ($db->num_rows($resql) != 1) {
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields (fk_object, "; $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields (fk_object, ";
foreach ($extrafield_values as $key => $value) { foreach ($extrafield_values as $key => $value) {
$sql .= str_replace('options_', '', $key) . ', '; $sql .= str_replace('options_', '', $key) . ', ';
@ -291,7 +290,7 @@ if (empty($reshook))
// Execute the sql command from above // Execute the sql command from above
$db->query($sql); $db->query($sql);
$newprice = price2num(GETPOST("price", "alpha")); $newprice = price2num(GETPOST("price", "alpha"));
if ($conf->multicurrency->enabled) if ($conf->multicurrency->enabled)

4
test/phpunit/UserTest.php
View File

@ -192,7 +192,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$newlocalobject=new User($this->savdb); $newlocalobject=new User($this->savdb);
$newlocalobject->initAsSpecimen(); $newlocalobject->initAsSpecimen();
$this->changeProperties($newlocalobject); $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; return $localobject;
} }
@ -309,7 +309,7 @@ class UserTest extends PHPUnit\Framework\TestCase
*/ */
public function changeProperties(&$localobject) public function changeProperties(&$localobject)
{ {
$localobject->note='New note after update'; $localobject->note_private='New note after update';
} }
/** /**