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

Fix: Use correct date

Browse Source
This commit is contained in:
Laurent Destailleur 2011-06-14 22:28:10 +00:00
parent 67b2cb1b48
commit d0a3ba0e07
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,7 @@ if ($action == 'new')
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>';
// Filter // Filter
print '<tr><td width="200">'.$langs->trans("Date").'</td><td>'; print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>';
print $html->select_date($filterdate,'fd',0,0,1,'',1,1); print $html->select_date($filterdate,'fd',0,0,1,'',1,1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("BankAccount").'</td><td>'; print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
@ -334,7 +334,7 @@ if ($action == 'new')
$sql.= " AND b.amount > 0"; $sql.= " AND b.amount > 0";
if ($filterdate) $sql.=" AND b.dateo = '".$db->idate($filterdate)."'"; if ($filterdate) $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
if ($filteraccountid) $sql.=" AND ba.rowid= '".$filteraccountid."'"; if ($filteraccountid) $sql.=" AND ba.rowid= '".$filteraccountid."'";
$sql.= $db->order("b.datec,b.rowid","ASC"); $sql.= $db->order("b.dateo,b.rowid","ASC");
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
@ -528,7 +528,7 @@ else
print_liste_field_titre($langs->trans("Bank"),$_SERVER["PHP_SELF"],"b.banque", "",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Bank"),$_SERVER["PHP_SELF"],"b.banque", "",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.datec", "",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.dateo", "",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre('','',''); print_liste_field_titre('','','');
print "</tr>\n"; print "</tr>\n";
$i=1; $i=1;

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

@ -85,7 +85,7 @@ NewCheckReceipt=New discount
NewCheckDeposit=New check deposit NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s NewCheckDepositOn=Create receipt for deposit on account: %s
NoWaitingChecks=No checks waiting for deposit. NoWaitingChecks=No checks waiting for deposit.
DateChequeReceived=Check reception input date DateChequeReceived=Check reception date
NbOfCheques=Nb of checks NbOfCheques=Nb of checks
PaySocialContribution=Pay a social contribution PaySocialContribution=Pay a social contribution
ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid? ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?

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

@ -85,7 +85,7 @@ NewCheckReceipt=Nouvelle remise
NewCheckDeposit=Nouveau dépôt NewCheckDeposit=Nouveau dépôt
NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s
NoWaitingChecks=Pas de chèque en attente de dépôt. NoWaitingChecks=Pas de chèque en attente de dépôt.
DateChequeReceived=Date saisie réception chèque DateChequeReceived=Date réception chèque
NbOfCheques=Nb de chèques NbOfCheques=Nb de chèques
PaySocialContribution=Payer une charge sociale PaySocialContribution=Payer une charge sociale
ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale à payée ? ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale à payée ?