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

Merge pull request #13260 from atm-quentin/FIX_ecm_files

Browse Source 
FIX ecm_files didnt match cause document ref contained "/"
This commit is contained in:
Laurent Destailleur 2020-03-03 23:09:02 +01:00 committed by GitHub
commit 7866f89585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/bom/class/bom.class.php
View File

@ -561,7 +561,7 @@ class BOM extends CommonObject
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
// Validate // Validate
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element; $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

2
htdocs/comm/propal/class/propal.class.php
View File

@ -1803,7 +1803,7 @@ class Propal extends CommonObject
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."propal"; $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql .= " SET ref = '".$this->db->escape($num)."',"; $sql .= " SET ref = '".$this->db->escape($num)."',";

2
htdocs/commande/class/commande.class.php
View File

@ -384,7 +384,7 @@ class Commande extends CommonOrder
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
// Validate // Validate
$sql = "UPDATE ".MAIN_DB_PREFIX."commande"; $sql = "UPDATE ".MAIN_DB_PREFIX."commande";

2
htdocs/compta/facture/class/facture.class.php
View File

@ -2530,7 +2530,7 @@ class Facture extends CommonInvoice
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
if ($num) if ($num)
{ {

2
htdocs/contrat/class/contrat.class.php
View File

@ -517,7 +517,7 @@ class Contrat extends CommonObject
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
if ($num) if ($num)
{ {

2
htdocs/expedition/class/expedition.class.php
View File

@ -697,7 +697,7 @@ class Expedition extends CommonObject
{ {
$numref = "EXP".$this->id; $numref = "EXP".$this->id;
} }
$this->newref = $numref; $this->newref = dol_sanitizeFileName($numref);
$now = dol_now(); $now = dol_now();

2
htdocs/expensereport/class/expensereport.class.php
View File

@ -1163,7 +1163,7 @@ class ExpenseReport extends CommonObject
} }
if (empty($num) || $num < 0) return -1; if (empty($num) || $num < 0) return -1;
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
$this->db->begin(); $this->db->begin();

2
htdocs/fichinter/class/fichinter.class.php
View File

@ -544,7 +544,7 @@ class Fichinter extends CommonObject
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter"; $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
$sql .= " SET fk_statut = 1"; $sql .= " SET fk_statut = 1";

4
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -587,7 +587,7 @@ class CommandeFournisseur extends CommonOrder
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur"; $sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
$sql .= " SET ref='".$this->db->escape($num)."',"; $sql .= " SET ref='".$this->db->escape($num)."',";
@ -971,7 +971,7 @@ class CommandeFournisseur extends CommonOrder
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
// Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated) // Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
$movetoapprovestatus = true; $movetoapprovestatus = true;

2
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -1413,7 +1413,7 @@ class FactureFournisseur extends CommonInvoice
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn"; $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
$sql .= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'"; $sql .= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";

2
htdocs/holiday/class/holiday.class.php
View File

@ -716,7 +716,7 @@ class Holiday extends CommonObject
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
// Update status // Update status
$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";

2
htdocs/livraison/class/livraison.class.php
View File

@ -404,7 +404,7 @@ class Livraison extends CommonObject
{ {
$numref = $this->ref; $numref = $this->ref;
} }
$this->newref = $numref; $this->newref = dol_sanitizeFileName($numref);
// Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice. // Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice.
$sql = "SELECT ref"; $sql = "SELECT ref";

2
htdocs/reception/class/reception.class.php
View File

@ -546,7 +546,7 @@ class Reception extends CommonObject
$numref = $this->ref; $numref = $this->ref;
} }
$this->newref = $numref; $this->newref = dol_sanitizeFileName($numref);
$now = dol_now(); $now = dol_now();

2
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1462,7 +1462,7 @@ class SupplierProposal extends CommonObject
{ {
$num = $this->ref; $num = $this->ref;
} }
$this->newref = $num; $this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal"; $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
$sql .= " SET ref = '".$this->db->escape($num)."',"; $sql .= " SET ref = '".$this->db->escape($num)."',";