Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
d0a3ba0e
Commit
d0a3ba0e
authored
13 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Use correct date
parent
67b2cb1b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/compta/paiement/cheque/fiche.php
+3
-3
3 additions, 3 deletions
htdocs/compta/paiement/cheque/fiche.php
htdocs/langs/en_US/compta.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/en_US/compta.lang
htdocs/langs/fr_FR/compta.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/fr_FR/compta.lang
with
5 additions
and
5 deletions
htdocs/compta/paiement/cheque/fiche.php
+
3
−
3
View file @
d0a3ba0e
...
...
@@ -304,7 +304,7 @@ if ($action == 'new')
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>';
// Filter
print
'<tr><td width="200">'
.
$langs
->
trans
(
"Date"
)
.
'</td><td>'
;
print
'<tr><td width="200">'
.
$langs
->
trans
(
"Date
ChequeReceived
"
)
.
'</td><td>'
;
print
$html
->
select_date
(
$filterdate
,
'fd'
,
0
,
0
,
1
,
''
,
1
,
1
);
print
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"BankAccount"
)
.
'</td><td>'
;
...
...
@@ -334,7 +334,7 @@ if ($action == 'new')
$sql
.
=
" AND b.amount > 0"
;
if
(
$filterdate
)
$sql
.
=
" AND b.dateo = '"
.
$db
->
idate
(
$filterdate
)
.
"'"
;
if
(
$filteraccountid
)
$sql
.
=
" AND ba.rowid= '"
.
$filteraccountid
.
"'"
;
$sql
.
=
$db
->
order
(
"b.date
c
,b.rowid"
,
"ASC"
);
$sql
.
=
$db
->
order
(
"b.date
o
,b.rowid"
,
"ASC"
);
$resql
=
$db
->
query
(
$sql
);
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
(
"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
(
"DateChequeReceived"
),
$_SERVER
[
"PHP_SELF"
],
"b.date
c
"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
$langs
->
trans
(
"DateChequeReceived"
),
$_SERVER
[
"PHP_SELF"
],
"b.date
o
"
,
""
,
$param
,
'align="center"'
,
$sortfield
,
$sortorder
);
print_liste_field_titre
(
''
,
''
,
''
);
print
"</tr>
\n
"
;
$i
=
1
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/compta.lang
+
1
−
1
View file @
d0a3ba0e
...
...
@@ -85,7 +85,7 @@ NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
NoWaitingChecks=No checks waiting for deposit.
DateChequeReceived=Check reception
input
date
DateChequeReceived=Check reception date
NbOfCheques=Nb of checks
PaySocialContribution=Pay a social contribution
ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/fr_FR/compta.lang
+
1
−
1
View file @
d0a3ba0e
...
...
@@ -85,7 +85,7 @@ NewCheckReceipt=Nouvelle remise
NewCheckDeposit=Nouveau dépôt
NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s
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
PaySocialContribution=Payer une charge sociale
ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale à payée ?
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment