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

New: Add protection to avoid to valid supplier invoice with a ref supplier with value "Copy of ..."

Browse Source
This commit is contained in:
Laurent Destailleur 2010-10-18 18:40:17 +00:00
parent 5e046a91cf
commit 3fdc5f1957
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,9 +559,9 @@ class FactureFournisseur extends Facture
} }
/** /**
* \brief Set invoice status as validated * Set invoice status as validated
* \param user Object user * @param user Object user
* \return int <0 if KO, =0 if nothing to do, >0 if OK * @return int <0 if KO, =0 if nothing to do, >0 if OK
*/ */
function validate($user) function validate($user)
{ {
@ -576,6 +576,13 @@ class FactureFournisseur extends Facture
return 0; return 0;
} }
// Check parameters
if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
{
$this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("RefSupplier"));
return -1;
}
$this->db->begin(); $this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn"; $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";

12
htdocs/fourn/facture/fiche.php
View File

@ -89,6 +89,10 @@ if ($_REQUEST['action'] == 'confirm_valid' && $_REQUEST['confirm'] == 'yes' && $
$facturefourn=new FactureFournisseur($db); $facturefourn=new FactureFournisseur($db);
$facturefourn->fetch($_GET['facid']); $facturefourn->fetch($_GET['facid']);
$result = $facturefourn->validate($user); $result = $facturefourn->validate($user);
if ($result < 0)
{
$mesg='<div class="error">'.$facturefourn->error.'</div>';
}
} }
if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes') if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes')
@ -468,7 +472,7 @@ if ($_GET['action'] == 'reopen' && $user->rights->fournisseur->facture->creer)
* Build document * Build document
*/ */
if ($_REQUEST['action'] == 'builddoc') if ($_REQUEST['action'] == 'builddoc')
{ {
/* /*
* Generation de la facture * Generation de la facture
@ -626,7 +630,7 @@ else
/* */ /* */
/* *************************************************************************** */ /* *************************************************************************** */
$now=gmmktime(); $now=dol_now();
$productstatic = new Product($db); $productstatic = new Product($db);
@ -1291,7 +1295,7 @@ else
/* /*
* Documents generes * Documents generes
*/ */
$facfournref=dol_sanitizeFileName($fac->ref); $facfournref=dol_sanitizeFileName($fac->ref);
$file=$conf->fournisseur->dir_output.'/facture/'. $facfournref . '/' . $facfournref . '.pdf'; $file=$conf->fournisseur->dir_output.'/facture/'. $facfournref . '/' . $facfournref . '.pdf';
$relativepath = $facfournref.'/'.$facfournref.'.pdf'; $relativepath = $facfournref.'/'.$facfournref.'.pdf';
@ -1301,7 +1305,7 @@ else
$delallowed=$user->rights->fournisseur->facture->supprimer; $delallowed=$user->rights->fournisseur->facture->supprimer;
$somethingshown=$formfile->show_documents('facture_fournisseur',$facfournref,$filedir,$urlsource,$genallowed,$delallowed,$facture->modelpdf); $somethingshown=$formfile->show_documents('facture_fournisseur',$facfournref,$filedir,$urlsource,$genallowed,$delallowed,$facture->modelpdf);
print '</td><td valign="top" width="50%">'; print '</td><td valign="top" width="50%">';
print '<br>'; print '<br>';