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

New: Ajout info nb de cheques

Browse Source
This commit is contained in:
Laurent Destailleur 2007-11-11 19:11:22 +00:00
parent aef8ca3364
commit 50f1f17d0a
5 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/paiement/cheque/fiche.php
View File

@ -294,12 +294,17 @@ else
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="2">'.dolibarr_print_date($remisecheque->date_bordereau).'</td></tr>'; print '<tr><td>'.$langs->trans('DateCreation').'</td><td colspan="2">'.dolibarr_print_date($remisecheque->date_bordereau,'day').'</td></tr>';
print '<tr><td>'.$langs->trans('Account').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('Account').'</td><td colspan="2">';
print $accountstatic->getNomUrl(1); print $accountstatic->getNomUrl(1);
print '</td></tr>'; print '</td></tr>';
// Nb of cheques
print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td colspan="2">';
print $remisecheque->nbcheque;
print '</td></tr>';
print '<tr><td>'.$langs->trans('Total').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('Total').'</td><td colspan="2">';
print price($remisecheque->amount); print price($remisecheque->amount);
print '</td></tr>'; print '</td></tr>';

14
htdocs/compta/paiement/cheque/index.php
View File

@ -96,12 +96,14 @@ else
print '</td><td valign="top" width="70%" class="notopnoleftnoright">'; print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount,bc.number,"; $sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount, bc.number,";
$sql.= " bc.statut, ba.label, ba.rowid as bid"; $sql.= " bc.statut, bc.nbcheque,";
$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc"; $sql.= " ba.label, ba.rowid as bid";
$sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc,";
$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= " WHERE ba.rowid=bc.fk_bank_account"; $sql.= " WHERE ba.rowid=bc.fk_bank_account";
$sql.= " ORDER BY bc.rowid DESC LIMIT 10;"; $sql.= " ORDER BY bc.rowid";
$sql.= " DESC LIMIT 10";
$resql = $db->query($sql); $resql = $db->query($sql);
@ -112,6 +114,7 @@ if ($resql)
print '<td>'.$langs->trans("CheckReceiptShort").'</td>'; print '<td>'.$langs->trans("CheckReceiptShort").'</td>';
print '<td>'.$langs->trans("Date")."</td>"; print '<td>'.$langs->trans("Date")."</td>";
print '<td>'.$langs->trans("Account").'</td>'; print '<td>'.$langs->trans("Account").'</td>';
print '<td align="right">'.$langs->trans("NbOfCheques").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>';
print '<td align="right">'.$langs->trans("Status").'</td>'; print '<td align="right">'.$langs->trans("Status").'</td>';
print "</tr>\n"; print "</tr>\n";
@ -132,6 +135,7 @@ if ($resql)
print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>'; print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
print '<td>'.dolibarr_print_date($objp->db,'day').'</td>'; print '<td>'.dolibarr_print_date($objp->db,'day').'</td>';
print '<td>'.$accountstatic->getNomUrl(1).'</td>'; print '<td>'.$accountstatic->getNomUrl(1).'</td>';
print '<td align="right">'.$objp->nbcheque.'</td>';
print '<td align="right">'.price($objp->amount).'</td>'; print '<td align="right">'.price($objp->amount).'</td>';
print '<td align="right">'.$checkdepositstatic->LibStatut($objp->statut,3).'</td>'; print '<td align="right">'.$checkdepositstatic->LibStatut($objp->statut,3).'</td>';

25
htdocs/compta/paiement/cheque/liste.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -53,7 +52,7 @@ $sortfield=$_GET["sortfield"];
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="bc.rowid"; if (! $sortfield) $sortfield="bc.number";
$checkdepositstatic=new RemiseCheque($db); $checkdepositstatic=new RemiseCheque($db);
$accountstatic=new Account($db); $accountstatic=new Account($db);
@ -65,7 +64,8 @@ $accountstatic=new Account($db);
llxHeader('',$langs->trans("ChequesReceipts")); llxHeader('',$langs->trans("ChequesReceipts"));
$sql = "SELECT bc.rowid, bc.number, ".$db->pdate("bc.date_bordereau") ." as dp, bc.amount, bc.statut,"; $sql = "SELECT bc.rowid, bc.number as ref, ".$db->pdate("bc.date_bordereau") ." as dp,";
$sql.= " bc.nbcheque, bc.amount, bc.statut,";
$sql.= " ba.rowid as bid, ba.label"; $sql.= " ba.rowid as bid, ba.label";
$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
$sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba";
@ -90,16 +90,20 @@ if ($resql)
print '<form method="get" action="liste.php">'; print '<form method="get" action="liste.php">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Ref"),"liste.php","bc.number","",$paramlist,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateCreation"),"liste.php","dp","",$paramlist,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("NbOfCheques"),"liste.php","bc.nbcheque","",$paramlist,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Amount"),"liste.php","bc.amount","",$paramlist,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),"liste.php","bc.statut","",$paramlist,'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
// Lignes des champs de filtre // Lignes des champs de filtre
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td align="right">'; print '<td align="right">';
print '<input class="fat" type="text" size="6" name="search_montant" value="'.$_GET["search_montant"].'">'; print '<input class="fat" type="text" size="6" name="search_montant" value="'.$_GET["search_montant"].'">';
print '</td><td align="right">'; print '</td><td align="right">';
@ -118,7 +122,7 @@ if ($resql)
print '<td width="80">'; print '<td width="80">';
$checkdepositstatic->rowid=$objp->rowid; $checkdepositstatic->rowid=$objp->rowid;
$checkdepositstatic->statut=$objp->statut; $checkdepositstatic->statut=$objp->statut;
$checkdepositstatic->number=$objp->number; $checkdepositstatic->number=$objp->ref;
print $checkdepositstatic->getNomUrl(1); print $checkdepositstatic->getNomUrl(1);
print '</td>'; print '</td>';
@ -131,6 +135,9 @@ if ($resql)
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
// Nb of cheques
print '<td align="right">'.$objp->nbcheque.'</td>';
// Montant // Montant
print '<td align="right">'.price($objp->amount).'</td>'; print '<td align="right">'.price($objp->amount).'</td>';

1
htdocs/langs/en_US/compta.lang
View File

@ -68,6 +68,7 @@ NewCheckDeposit=New check deposit
NewCheckDepositOn=New check deposit on account: %s NewCheckDepositOn=New check deposit on account: %s
NoWaitingChecks=No checks waiting for deposit. NoWaitingChecks=No checks waiting for deposit.
DateChequeReceived=Cheque reception input date DateChequeReceived=Cheque reception input date
NbOfCheques=Nb of cheques
PaySocialContribution=Pay a social contribution PaySocialContribution=Pay a social contribution
ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as payed? ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as payed?
DeleteSocialContribution=Delete a social contribution DeleteSocialContribution=Delete a social contribution

1
htdocs/langs/fr_FR/compta.lang
View File

@ -68,6 +68,7 @@ NewCheckDeposit=Nouveau d
NewCheckDepositOn=Nouveau dépôt sur compte: %s NewCheckDepositOn=Nouveau dépôt sur compte: %s
NoWaitingChecks=Pas de chèque en attente de dépots. NoWaitingChecks=Pas de chèque en attente de dépots.
DateChequeReceived=Date saisie réception chèque DateChequeReceived=Date saisie réception chèque
NbOfCheques=Nb de cheques
PaySocialContribution=Payer une charge sociale PaySocialContribution=Payer une charge sociale
ConfirmPaySocialContribution=Etes-vous sûr de vouloir classer cette charge sociale à payé ? ConfirmPaySocialContribution=Etes-vous sûr de vouloir classer cette charge sociale à payé ?
DeleteSocialContribution=Effacer charge sociale DeleteSocialContribution=Effacer charge sociale