From 5cb43e15214708b815bf5830fe408dd3a4753b59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Aug 2010 00:06:23 +0000 Subject: [PATCH] Error management --- htdocs/fourn/paiement/fiche.php | 453 ++++++++++++++++---------------- 1 file changed, 232 insertions(+), 221 deletions(-) diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 8d640d1c006..697c09458ba 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -89,9 +89,6 @@ if ($_POST['action'] == 'confirm_valide' && $_POST['confirm'] == 'yes' && $user- llxHeader(); -$paiement = new PaiementFourn($db); -$paiement->fetch($_GET['id']); - $html = new Form($db); $h=0; @@ -108,246 +105,260 @@ $h++; dol_fiche_head($head, $hselected, $langs->trans('SupplierPayment'), 0, 'payment'); -/* - * Confirmation de la suppression du paiement - */ -if ($_GET['action'] == 'delete') +$paiement = new PaiementFourn($db); +$result=$paiement->fetch($_GET['id']); +if ($result > 0) { - $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete'); - if ($ret == 'html') print '
'; -} -/* - * Confirmation de la validation du paiement - */ -if ($_GET['action'] == 'valide') -{ - $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide'); - if ($ret == 'html') print '
'; -} - -if (!empty($_POST['action']) && $_POST['action'] == 'update_num' && !empty($_POST['new_num'])) -{ - $res = $paiement->update_num($_POST['new_num']); - if ($res === 0) { - $mesg = '
'.$langs->trans('PaymentNumberUpdateSucceeded').'
'; - } else { - $mesg = '
'.$langs->trans('PaymentNumberUpdateFailed').'
'; - } -} - -if (!empty($_POST['action']) && $_POST['action'] == 'update_date' && !empty($_POST['reday'])) -{ - $datepaye = dol_mktime(12, 0 , 0, - $_POST['remonth'], - $_POST['reday'], - $_POST['reyear']); - $res = $paiement->update_date($datepaye); - if ($res === 0) { - $mesg = '
'.$langs->trans('PaymentDateUpdateSucceeded').'
'; - } else { - $mesg = '
'.$langs->trans('PaymentDateUpdateFailed').'
'; - } -} - - -print ''; - -print ''; -print ''; - -//switch through edition options for date (only available when statut is -not 1- (=validated)) -if (empty($_GET['action']) || $_GET['action']!='edit_date') -{ - print ''; - print ''; -} -else -{ - print ''; - print ''; - print ''; - print ''; -} - -print ''; - -//switch through edition options for number (only available when statut is -not 1- (=validated)) -if (empty($_GET['action']) || $_GET['action'] != 'edit_num') -{ - print ''; - print ''; -} -else -{ - print ''; - print ''; - print ''; - print ''; -} -print ''; - -if ($conf->global->BILL_ADD_PAYMENT_VALIDATION) -{ - print ''; -} - -print ''; - -if ($conf->banque->enabled) -{ - if ($paiement->bank_account) + /* + * Confirmation de la suppression du paiement + */ + if ($_GET['action'] == 'delete') { - // Si compte renseigne, on affiche libelle - $bank=new Account($db); - $bank->fetch($paiement->bank_account); + $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete'); + if ($ret == 'html') print '
'; + } - $bankline=new AccountLine($db); - $bankline->fetch($paiement->bank_line); + /* + * Confirmation de la validation du paiement + */ + if ($_GET['action'] == 'valide') + { + $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide'); + if ($ret == 'html') print '
'; + } + if (!empty($_POST['action']) && $_POST['action'] == 'update_num' && !empty($_POST['new_num'])) + { + $res = $paiement->update_num($_POST['new_num']); + if ($res === 0) { + $mesg = '
'.$langs->trans('PaymentNumberUpdateSucceeded').'
'; + } else { + $mesg = '
'.$langs->trans('PaymentNumberUpdateFailed').'
'; + } + } + + if (!empty($_POST['action']) && $_POST['action'] == 'update_date' && !empty($_POST['reday'])) + { + $datepaye = dol_mktime(12, 0 , 0, + $_POST['remonth'], + $_POST['reday'], + $_POST['reyear']); + $res = $paiement->update_date($datepaye); + if ($res === 0) { + $mesg = '
'.$langs->trans('PaymentDateUpdateSucceeded').'
'; + } else { + $mesg = '
'.$langs->trans('PaymentDateUpdateFailed').'
'; + } + } + + + print '
'.$langs->trans('Ref').''.$paiement->id.'
'; - print ''; - if ($paiement->statut == 0 && $_GET['action'] != 'edit_date') print ''; - print '
'; - print $langs->trans('Date'); - print ''.img_edit($langs->trans('Modify')).'
'; - print '		'.dol_print_date($paiement->date,'day').'
'.$langs->trans('Date').''; - print '
'; - print ''; - if (!empty($_POST['remonth']) && !empty($_POST['reday']) && !empty($_POST['reyear'])) - $sel_date=dol_mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); - else - $sel_date=$paiement->date; - $html->select_date($sel_date,'','','','',"addpaiement"); - print ''; - print '
'; - print '
'.$langs->trans('Type').''.$paiement->type_libelle.'
'; - print ''; - if ($paiement->statut == 0 && $_GET['action'] != 'edit_num') print ''; - print '
'; - print $langs->trans('Numero'); - print ''.img_edit($langs->trans('Modify')).'
'; - print '		'.$paiement->numero.'
'.$langs->trans('Numero').''; - print '
'; - print ''; - if (!empty($_POST['new_num'])) - $num = $this->db->escape($_POST['new_num']); - else - $num = $paiement->numero; - print ''; - print ''; - print '
'.$langs->trans('Amount').''.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).'
'.$langs->trans('Status').''.$paiement->getLibStatut(4).'
'.$langs->trans('Note').''.nl2br($paiement->note).'
'; + + print ''; + print ''; + + //switch through edition options for date (only available when statut is -not 1- (=validated)) + if (empty($_GET['action']) || $_GET['action']!='edit_date') + { + print ''; + print ''; + } + else + { print ''; - print ''; - print ''; - print ''; + print ''; + print ''; print ''; } -} -print '
'.$langs->trans('Ref').''.$paiement->id.'
'; + print ''; + if ($paiement->statut == 0 && $_GET['action'] != 'edit_date') print ''; + print '
'; + print $langs->trans('Date'); + print ''.img_edit($langs->trans('Modify')).'
'; + print '		'.dol_print_date($paiement->date,'day').'
'.$langs->trans('BankAccount').''.img_object($langs->trans('ShowAccount'),'account').' '.$bank->label.''.$langs->trans('BankLineConciliated').''.yn($bankline->rappro).''.$langs->trans('Date').''; + print '
'; + print ''; + if (!empty($_POST['remonth']) && !empty($_POST['reday']) && !empty($_POST['reyear'])) + $sel_date=dol_mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + else + $sel_date=$paiement->date; + $html->select_date($sel_date,'','','','',"addpaiement"); + print ''; + print '
'; + print '
'; + print ''.$langs->trans('Type').''.$paiement->type_libelle.''; -if ($mesg) print '
'.$mesg; - -print '
'; - -/** - * Liste des factures - */ -$allow_delete = 1 ; -$sql = 'SELECT f.rowid as ref, f.facnumber as ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.rowid as socid'; -$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s'; -$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid'; -$sql .= ' AND pf.fk_paiementfourn = '.$paiement->id; -$resql=$db->query($sql); -if ($resql) -{ - $num = $db->num_rows($resql); - - $i = 0; - $total = 0; - print ''.$langs->trans("Invoices").'
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - - if ($num > 0) + //switch through edition options for number (only available when statut is -not 1- (=validated)) + if (empty($_GET['action']) || $_GET['action'] != 'edit_num') { - $var=True; + print ''; + print ''; + } + else + { + print ''; + print ''; + print ''; + print ''; + } + print ''; - $facturestatic=new FactureFournisseur($db); + if ($conf->global->BILL_ADD_PAYMENT_VALIDATION) + { + print ''; + } - while ($i < $num) + print ''; + + if ($conf->banque->enabled) + { + if ($paiement->bank_account) { - $objp = $db->fetch_object($resql); - $var=!$var; - print ''; - // Ref - print '\n"; - // Ref supplier - print '\n"; - // Third party - print ''; - // Expected to pay - print ''; - // Status - print ''; - // Payed - print ''; - print "\n"; - if ($objp->paye == 1) - { - $allow_delete = 0; - } - $total = $total + $objp->amount; - $i++; + // Si compte renseigne, on affiche libelle + $bank=new Account($db); + $bank->fetch($paiement->bank_account); + + $bankline=new AccountLine($db); + $bankline->fetch($paiement->bank_line); + + print ''; + print ''; + print ''; + print ''; + print ''; } } - $var=!$var; - print "
'.$langs->trans('Ref').''.$langs->trans('RefSupplier').''.$langs->trans('Company').''.$langs->trans('ExpectedToPay').''.$langs->trans('Status').''.$langs->trans('PayedByThisPayment').'
'; + print ''; + if ($paiement->statut == 0 && $_GET['action'] != 'edit_num') print ''; + print '
'; + print $langs->trans('Numero'); + print ''.img_edit($langs->trans('Modify')).'
'; + print '		'.$paiement->numero.'
'.$langs->trans('Numero').''; + print '
'; + print ''; + if (!empty($_POST['new_num'])) + $num = $this->db->escape($_POST['new_num']); + else + $num = $paiement->numero; + print ''; + print ''; + print '
'.$langs->trans('Amount').''.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).'
'.$langs->trans('Status').''.$paiement->getLibStatut(4).'
'.$langs->trans('Note').''.nl2br($paiement->note).'
'.img_object($langs->trans('ShowBill'),'bill').' '; - print $objp->ref; - print "'.$objp->ref_supplier."'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''.price($objp->total_ttc).''.$facturestatic->LibStatut($objp->paye,$objp->fk_statut,2,1).''.price($objp->amount).'
'.$langs->trans('BankAccount').''.img_object($langs->trans('ShowAccount'),'account').' '.$bank->label.''.$langs->trans('BankLineConciliated').''.yn($bankline->rappro).'
\n"; - $db->free($resql); + print ''; + + if ($mesg) print '
'.$mesg; + + print '
'; + + /** + * Liste des factures + */ + $allow_delete = 1 ; + $sql = 'SELECT f.rowid as ref, f.facnumber as ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.rowid as socid'; + $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s'; + $sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid'; + $sql .= ' AND pf.fk_paiementfourn = '.$paiement->id; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + + $i = 0; + $total = 0; + print ''.$langs->trans("Invoices").'
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + if ($num > 0) + { + $var=True; + + $facturestatic=new FactureFournisseur($db); + + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print ''; + // Ref + print '\n"; + // Ref supplier + print '\n"; + // Third party + print ''; + // Expected to pay + print ''; + // Status + print ''; + // Payed + print ''; + print "\n"; + if ($objp->paye == 1) + { + $allow_delete = 0; + } + $total = $total + $objp->amount; + $i++; + } + } + $var=!$var; + + print "
'.$langs->trans('Ref').''.$langs->trans('RefSupplier').''.$langs->trans('Company').''.$langs->trans('ExpectedToPay').''.$langs->trans('Status').''.$langs->trans('PayedByThisPayment').'
'.img_object($langs->trans('ShowBill'),'bill').' '; + print $objp->ref; + print "'.$objp->ref_supplier."'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''.price($objp->total_ttc).''.$facturestatic->LibStatut($objp->paye,$objp->fk_statut,2,1).''.price($objp->amount).'
\n"; + $db->free($resql); + } + else + { + dol_print_error($db); + } + + print ''; + + + /* + * Boutons Actions + */ + + print '
'; + if ($conf->global->BILL_ADD_PAYMENT_VALIDATION) + { + if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET['action'] == '') + { + if ($user->rights->fournisseur->facture->valider) + { + print ''.$langs->trans('Valid').''; + + } + } + } + if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET['action'] == '') + { + if ($user->rights->fournisseur->facture->supprimer) + { + print ''.$langs->trans('Delete').''; + + } + } + print '
'; + } else { - dol_print_error($db); + $langs->load("errors"); + print $langs->trans("ErrorRecordNotFound"); } -print ''; - - -/* - * Boutons Actions - */ - -print '
'; -if ($conf->global->BILL_ADD_PAYMENT_VALIDATION) -{ - if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET['action'] == '') - { - if ($user->rights->fournisseur->facture->valider) - { - print ''.$langs->trans('Valid').''; - - } - } -} -if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET['action'] == '') -{ - if ($user->rights->fournisseur->facture->supprimer) - { - print ''.$langs->trans('Delete').''; - - } -} -print '
'; +dol_fiche_end(); $db->close();