From d51d0634232a11a9b75a70b6c184a0d36ad7a2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 2 Nov 2019 17:34:27 +0100 Subject: [PATCH 1/4] css --- htdocs/imports/index.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 2ce0139f517..7f9c113b10f 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -54,6 +54,7 @@ print '
'; // List of import set /* +print '
'; print ''; print ''; print ''; @@ -84,6 +85,7 @@ else print ''; } print '
'.$langs->trans("Module").'
'.$langs->trans("NoImportableData").'
'; +print '
'; print '
'; */ @@ -107,6 +109,7 @@ print '
'; // List of available import format +print '
'; print ''; print ''; print ''; @@ -130,6 +133,7 @@ foreach($liste as $key) } print '
'.$langs->trans("AvailableFormats").'
'; +print '
'; //print ''; From 4a564cc05de3b40e1ff0acfee4a5111111dd5004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 2 Nov 2019 18:10:01 +0100 Subject: [PATCH 2/4] Update product.class.php --- htdocs/product/class/product.class.php | 1 - 1 file changed, 1 deletion(-) 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) { From 534f8712a3d95a1f7d446bc612ce9e5661605b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 2 Nov 2019 18:11:18 +0100 Subject: [PATCH 3/4] Update fournisseurs.php --- htdocs/product/fournisseurs.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) From 3e2d89dc027d27ceee7b47603ee6677181d7a15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 2 Nov 2019 18:16:09 +0100 Subject: [PATCH 4/4] Update ticket.lib.php --- htdocs/core/lib/ticket.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)