diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 49cb9529c71..5abc1f56817 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1364,41 +1364,42 @@ else
print '
';
- print '';
- $htmlname = (($usercancreate && $action == 'editmulticurrencycode')?'multicurrency_code':'none');
- $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
- print ' | ';
+ }
+ print '';
+ print '';
+ $htmlname = (($usercancreate && $action == 'editmulticurrencycode')?'multicurrency_code':'none');
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
+ print ' | ';
- // Multicurrency rate
- if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
- {
- print '';
- print '| ';
- print '';
- print ' | ';
- if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
- if($action == 'actualizemulticurrencyrate') {
- list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
- }
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate?'multicurrency_tx':'none'), $object->multicurrency_code);
- } else {
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
- if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
- print '';
- }
+ // Multicurrency rate
+ if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
+ {
+ print ' |
';
+ print '| ';
+ print '';
+ print ' | ';
+ if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
}
- print ' |
';
- }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate?'multicurrency_tx':'none'), $object->multicurrency_code);
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
+ }
+ print '';
+ }
}
// Help of substitution key
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index f127a3bb6e6..e211f29962c 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,8 +881,10 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
/**
- * @var $object ActionComm
- * @return array
+ * getTicketActionCommEcmList
+ *
+ * @param ActionComm $object
+ * @return array Array of documents in index table
*/
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..e38fe7c4673 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -291,7 +291,7 @@ if (empty($reshook))
// Execute the sql command from above
$db->query($sql);
-
+
$newprice = price2num(GETPOST("price", "alpha"));
if ($conf->multicurrency->enabled)