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

New: Can filter on date when building cheque receipts

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-18 21:51:53 +00:00
parent 78df91cd23
commit 9a542352a4
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -51,6 +51,7 @@ For users:
and credit note if mask is same. and credit note if mask is same.
- New: Add status into export. Add default language into export. - New: Add status into export. Add default language into export.
- New: Can remove a project if project has tasks. - New: Can remove a project if project has tasks.
- New: Can filter on date when building cheque receipts.
- Fix: Better Postgresql compatibility. - Fix: Better Postgresql compatibility.
For developers: For developers:

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

@ -58,7 +58,8 @@ $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
$dir=$conf->banque->dir_output.'/bordereau/'; $dir=$conf->banque->dir_output.'/bordereau/';
$filterdate=dol_mktime(0,0,0,$_POST['fdmonth'],$_POST['fdday'],$_POST['fdyear']);
//var_dump($_POST);
/* /*
* Actions * Actions
@ -287,11 +288,25 @@ if ($action == 'new')
$accounts = array(); $accounts = array();
$lines = array(); $lines = array();
$now=time(); $now=dol_now();
print $langs->trans("SelectChequeTransactionAndGenerate").'<br>';
print '<form class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="action" value="new">';
//print '<fieldset><legend>aaa</legend>';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>'; //print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
print '</table><br>'; // Filter
print '<tr><td>'.$langs->trans("Date").'</td><td>';
print $html->select_date($filterdate,'fd',0,0,1);
print '</td></tr>';
print '<tr><td colspan="2" align="center">';
print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
print '</td></tr>';
print '</table>';
//print '</fieldset>';
print '</form>';
print '<br>';
$sql = "SELECT ba.rowid as bid, b.dateo as date, b.rowid as chqid, "; $sql = "SELECT ba.rowid as bid, b.dateo as date, b.rowid as chqid, ";
$sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque"; $sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque";
@ -302,6 +317,7 @@ if ($action == 'new')
$sql.= " AND ba.entity = ".$conf->entity; $sql.= " AND ba.entity = ".$conf->entity;
$sql.= " AND b.fk_bordereau = 0"; $sql.= " AND b.fk_bordereau = 0";
$sql.= " AND b.amount > 0"; $sql.= " AND b.amount > 0";
if ($filterdate) $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
$sql.= $db->order("b.dateo,b.rowid","ASC"); $sql.= $db->order("b.dateo,b.rowid","ASC");
$resql = $db->query($sql); $resql = $db->query($sql);
@ -353,7 +369,8 @@ if ($action == 'new')
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived")." &nbsp;</td>\n"; print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
print "</td>\n";
print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n"; print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n"; print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n"; print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";

2
htdocs/langs/en_US/banks.lang
View File

@ -140,3 +140,5 @@ AllAccounts=All bank/cash accounts
BackToAccount=Back to account BackToAccount=Back to account
ShowAllAccounts=Show for all accounts ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate. FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque receipt and click on "Create".

3
htdocs/langs/fr_FR/banks.lang
View File

@ -140,4 +140,5 @@ BankTransactionLine=Écriture bancaire
AllAccounts=Tous les comptes bancaires/caisses AllAccounts=Tous les comptes bancaires/caisses
BackToAccount=Retour au compte BackToAccount=Retour au compte
ShowAllAccounts=Afficher pour tous les comptes ShowAllAccounts=Afficher pour tous les comptes
FutureTransaction=Transaction future. Pas moyen de concilier. FutureTransaction=Transaction future. Pas moyen de concilier.
SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise et cliquer sur "Créer".