entity = trim($this->entity);
}
if (isset($this->filename)) {
- $this->filename = trim($this->filename);
+ $this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
}
if (isset($this->filepath)) {
$this->filepath = trim($this->filepath);
@@ -346,12 +346,13 @@ class EcmFiles extends CommonObject
$sql .= " t.src_object_id";
$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
$sql.= ' WHERE 1 = 1';
- /* Fetching this table depends on filepath+filename, it must not depends on entity
+ /* Fetching this table depends on filepath+filename, it must not depends on entity because filesystem on disk does not know what is Dolibarr entities
if (! empty($conf->multicompany->enabled)) {
$sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
}*/
if ($relativepath) {
- $sql .= " AND t.filepath = '" . $this->db->escape(dirname($relativepath)) . "' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
+ $relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath); // We must never have the .noexe into the database
+ $sql .= " AND t.filepath = '" . $this->db->escape(dirname($relativepath)) . "' AND t.filename = '".$this->db->escape(basename($relativepathwithnoexe))."'";
$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
}
elseif (! empty($ref)) { // hash of file path
@@ -552,46 +553,47 @@ class EcmFiles extends CommonObject
// Clean parameters
if (isset($this->ref)) {
- $this->ref = trim($this->ref);
+ $this->ref = trim($this->ref);
}
if (isset($this->label)) {
- $this->label = trim($this->label);
+ $this->label = trim($this->label);
}
if (isset($this->share)) {
- $this->share = trim($this->share);
+ $this->share = trim($this->share);
}
if (isset($this->entity)) {
- $this->entity = trim($this->entity);
+ $this->entity = trim($this->entity);
}
if (isset($this->filename)) {
- $this->filename = trim($this->filename);
+ $this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
}
if (isset($this->filepath)) {
- $this->filepath = trim($this->filepath);
+ $this->filepath = trim($this->filepath);
+ $this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
}
if (isset($this->fullpath_orig)) {
- $this->fullpath_orig = trim($this->fullpath_orig);
+ $this->fullpath_orig = trim($this->fullpath_orig);
}
if (isset($this->description)) {
- $this->description = trim($this->description);
+ $this->description = trim($this->description);
}
if (isset($this->keywords)) {
- $this->keywords = trim($this->keywords);
+ $this->keywords = trim($this->keywords);
}
if (isset($this->cover)) {
- $this->cover = trim($this->cover);
+ $this->cover = trim($this->cover);
}
if (isset($this->gen_or_uploaded)) {
- $this->gen_or_uploaded = trim($this->gen_or_uploaded);
+ $this->gen_or_uploaded = trim($this->gen_or_uploaded);
}
if (isset($this->extraparams)) {
- $this->extraparams = trim($this->extraparams);
+ $this->extraparams = trim($this->extraparams);
}
if (isset($this->fk_user_m)) {
- $this->fk_user_m = trim($this->fk_user_m);
+ $this->fk_user_m = trim($this->fk_user_m);
}
if (isset($this->acl)) {
- $this->acl = trim($this->acl);
+ $this->acl = trim($this->acl);
}
if (isset($this->src_object_type)) {
$this->src_object_type = trim($this->src_object_type);
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 3664a2e7f28..e1796068370 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -139,6 +139,12 @@ if ($action == 'update')
$oldfile = $olddir.$oldlabel;
$newfile = $newdir.$newlabel;
+ $newfileformove = $newfile;
+ // If old file end with .noexe, new file must also end with .noexe
+ if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
+ $newfileformove .= '.noexe';
+ }
+ //var_dump($oldfile);var_dump($newfile);exit;
// Now we update index of file
$db->begin();
@@ -146,7 +152,7 @@ if ($action == 'update')
//print $oldfile.' - '.$newfile;
if ($newlabel != $oldlabel)
{
- $result = dol_move($oldfile, $newfile); // This include update of database
+ $result = dol_move($oldfile, $newfileformove); // This include update of database
if (!$result)
{
$langs->load('errors');
@@ -190,7 +196,7 @@ if ($action == 'update')
$object->entity = $conf->entity;
$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
$object->filename = $newlabel;
- $object->label = md5_file(dol_osencode($newfile)); // hash of file content
+ $object->label = md5_file(dol_osencode($newfileformove)); // hash of file content
$object->fullpath_orig = '';
$object->gen_or_uploaded = 'unknown';
$object->description = ''; // indexed content
@@ -208,6 +214,11 @@ if ($action == 'update')
$db->commit();
$urlfile = $newlabel;
+ // If old file end with .noexe, new file must also end with .noexe
+ if (preg_match('/\.noexe$/', $newfileformove)) {
+ $urlfile .= '.noexe';
+ }
+
header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'§ion='.urlencode($section));
exit;
}
@@ -264,9 +275,13 @@ while ($tmpecmdir && $result > 0)
$i++;
}
+$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
+
$s = img_picto('', 'object_dir').' '.$langs->trans("ECMRoot").' -> '.$s.' -> ';
-if ($action == 'edit') $s .= '';
-else $s .= $urlfile;
+if ($action == 'edit') $s .= '';
+else $s .= $urlfiletoshow;
+
+$morehtml = '';
$object->ref = ''; // Force to hide ref
dol_banner_tab($object, '', $morehtml, 0, '', '', $s);
@@ -289,10 +304,9 @@ print dol_print_size($totalsize);
print '
';
*/
+// Hash of file content
print '
'.$langs->trans("HashOfFileContent").'
';
$object = new EcmFiles($db);
-//$filenametosearch=basename($filepath);
-//$filedirtosearch=basedir($filepath);
$object->fetch(0, '', $filepathtodocument);
if (!empty($object->label))
{
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index e51efb01aaa..852d148e258 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -124,15 +124,17 @@ if ($action == 'confirm_deletefile')
if (GETPOST('confirm') == 'yes')
{
// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
- //var_dump(GETPOST('urlfile'));exit;
$upload_dir = $conf->ecm->dir_output.($relativepath?'/'.$relativepath:'');
$file = $upload_dir . "/" . GETPOST('urlfile', 'alpha');
+ //var_dump($file);exit;
$ret=dol_delete_file($file); // This include also the delete from file index in database.
if ($ret)
{
- setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
+ $urlfiletoshow = GETPOST('urlfile', 'alpha');
+ $urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfiletoshow);
+ setEventMessages($langs->trans("FileWasRemoved", $urlfiletoshow), null, 'mesgs');
$result=$ecmdir->changeNbOfFiles('-');
}
else
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index fd45d2daecb..ef6b9241c8d 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -75,8 +75,6 @@ $pagenext = $page + 1;
if (!$sortorder) $sortorder = "DESC";
if (!$sortfield)
{
- //if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sortfield="fd.date";
- //else
$sortfield = "f.ref";
}
@@ -203,7 +201,7 @@ foreach ($arrayfields as $tmpkey => $tmpval)
$sql = "SELECT";
$sql .= " f.ref, f.rowid, f.fk_statut, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,";
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= "fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
$sql .= " s.nom as name, s.rowid as socid, s.client";
if (!empty($conf->projet->enabled)) {
$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
@@ -245,7 +243,7 @@ if ($search_contrat_ref) {
$sql .= natural_search('c.ref', $search_contrat_ref);
}
if ($search_desc) {
- if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
+ if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
else $sql .= natural_search(array('f.description'), $search_desc);
}
if ($search_status != '' && $search_status >= 0) {
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index c5b61e50ed6..d145e75bad6 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -255,3 +255,4 @@ WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different re
WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
WarningProjectClosed=Project is closed. You must re-open it first.
WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
+WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
\ No newline at end of file
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index abf818f2fe0..e51f8913e48 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -643,6 +643,12 @@ class Societe extends CommonObject
*/
public $multicurrency_code;
+ /**
+ * @var Account Default BAN account
+ */
+ public $bank_account;
+
+
/**
* Constructor
*
@@ -4194,6 +4200,17 @@ class Societe extends CommonObject
}
}
+ if (! isset($this->bank_account)) {
+ require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+ $bac = new CompanyBankAccount($this->db);
+ $result = $bac->fetch(0, $this->id);
+ if ($result > 0) {
+ $this->bank_account = $bac;
+ } else {
+ $this->bank_account = '';
+ }
+ }
+
$modelpath = "core/modules/societe/doc/";
$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);