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

Use ajax confirm box to validate supplier invoice

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-19 13:15:58 +00:00
parent 5046225bcc
commit 395a35d0dd
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/facture.php
View File

@ -2867,16 +2867,9 @@ else
print '<a class="butAction" '; print '<a class="butAction" ';
if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX) if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
{ {
// on verifie si la commande est en numerotation provisoire // We check if number is temporary number
$ref = substr($fac->ref, 1, 4); if (eregi('^\(PROV',$fac->ref)) $num = $fac->getNextNumRef($soc);
if ($ref == 'PROV') else $num = $fac->ref;
{
$num = $fac->getNextNumRef($soc);
}
else
{
$num = $fac->ref;
}
$url = $_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=confirm_valid&confirm=yes'; $url = $_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=confirm_valid&confirm=yes';
print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmValidateBill',$num)).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"'; print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmValidateBill',$num)).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"';
} }

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

@ -21,11 +21,11 @@
*/ */
/** /**
\file htdocs/fourn/facture/fiche.php * \file htdocs/fourn/facture/fiche.php
\ingroup facture, fournisseur * \ingroup facture, fournisseur
\brief Page for supplier invoice card * \brief Page for supplier invoice card
\version $Id$ * \version $Id$
*/ */
require_once('./pre.inc.php'); require_once('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php');
@ -53,7 +53,7 @@ $html = new Form($db);
$mesg=''; $mesg='';
$action=isset($_GET['action'])?$_GET['action']:$_POST['action']; $action=isset($_GET['action'])?$_GET['action']:$_POST['action'];
if ($_POST['action'] == 'confirm_valid' && $_POST['confirm'] == 'yes' && $user->rights->fournisseur->facture->valider) if ($_REQUEST['action'] == 'confirm_valid' && $_REQUEST['confirm'] == 'yes' && $user->rights->fournisseur->facture->valider)
{ {
$facturefourn=new FactureFournisseur($db); $facturefourn=new FactureFournisseur($db);
$facturefourn->fetch($_GET['facid']); $facturefourn->fetch($_GET['facid']);
@ -894,6 +894,7 @@ else
/* /*
* Boutons actions * Boutons actions
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($fac->statut <= 1 && $fac->getSommePaiement() <= 0 && $user->rights->fournisseur->facture->creer) if ($fac->statut <= 1 && $fac->getSommePaiement() <= 0 && $user->rights->fournisseur->facture->creer)
@ -918,7 +919,20 @@ else
{ {
if (sizeof($fac->lignes) && $_GET['action'] <> 'edit') if (sizeof($fac->lignes) && $_GET['action'] <> 'edit')
{ {
print '<a class="butAction" href="fiche.php?facid='.$fac->id.'&amp;action=valid">'.$langs->trans('Valid').'</a>'; print '<a class="butAction" ';
if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
{
// We check if number is temporary number
if (eregi('^\(PROV',$fac->ref)) $num = $fac->getNextNumRef($soc);
else $num = $fac->ref;
$url = $_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=confirm_valid&confirm=yes';
print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmValidateBill',$num)).'\',\''.dol_escape_js($langs->trans("Yes")).'\',\''.dol_escape_js($langs->trans("No")).'\',\'validate\')"';
}
else
{
print 'href="'.$_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=valid"';
}
print '>'.$langs->trans('Validate').'</a>';
} }
} }
else else