[pull] develop from Dolibarr:develop

htdocs/core/class/html.formmail.class.php

@@ -871,7 +871,8 @@ public function get_form($addfileaction = 'addfile', $removefileaction = 'remove
  // Preview of attachment
  $out .= img_mime($listofnames[$key]).$listofnames[$key];
 
- $out .= ' '.$formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity='.((int) $entity));
+ $out .= ' '.$formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity='.((int) $entity)));
+
  if (!$this->withfilereadonly) {
  $out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile input-nobottom" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
  //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).'&id=removedfile_'.$key.'">'.img_delete($langs->trans("Remove"), 'id="removedfile_'.$key.'" name="removedfile_'.$key.'"', 'removedfile input-nobottom').'</a>';

htdocs/product/stock/stocktransfer/class/stocktransfer.class.php

@@ -64,12 +64,7 @@ class StockTransfer extends CommonObject
  public $isextrafieldmanaged = 1;
 
  /**
- * @var int Name of subtable line
- */
- public $table_element_line = 'stocktransfer_stocktransferline';
-
- /**
- * @var int Field with ID of parent key if this object has a parent
+ * @var string Field with ID of parent key if this object has a parent
  */
  public $fk_element = 'fk_stocktransfer';