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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
2a3ed3d0
Commit
2a3ed3d0
authored
15 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Qual: A lot of screen more clear
parent
7eec919f
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/compta/bank/account.php
+3
-6
3 additions, 6 deletions
htdocs/compta/bank/account.php
htdocs/compta/bank/search.php
+76
-2
76 additions, 2 deletions
htdocs/compta/bank/search.php
htdocs/fourn/paiement/fiche.php
+6
-6
6 additions, 6 deletions
htdocs/fourn/paiement/fiche.php
with
85 additions
and
14 deletions
htdocs/compta/bank/account.php
+
3
−
6
View file @
2a3ed3d0
...
@@ -497,10 +497,7 @@ if ($account || $_GET["ref"])
...
@@ -497,10 +497,7 @@ if ($account || $_GET["ref"])
// Description
// Description
print
'<td>'
;
print
'<td>'
;
// Show generic description
$links
=
$acct
->
get_url
(
$objp
->
rowid
);
// Sgow generic description
if
(
preg_match
(
'/^\((.*)\)$/i'
,
$objp
->
label
,
$reg
))
if
(
preg_match
(
'/^\((.*)\)$/i'
,
$objp
->
label
,
$reg
))
{
{
// Generic description because between (). We show it after translating.
// Generic description because between (). We show it after translating.
...
@@ -510,8 +507,8 @@ if ($account || $_GET["ref"])
...
@@ -510,8 +507,8 @@ if ($account || $_GET["ref"])
{
{
print
dol_trunc
(
$objp
->
label
,
60
);
print
dol_trunc
(
$objp
->
label
,
60
);
}
}
// Add links after description
// Add links after description
$links
=
$acct
->
get_url
(
$objp
->
rowid
);
foreach
(
$links
as
$key
=>
$val
)
foreach
(
$links
as
$key
=>
$val
)
{
{
if
(
$links
[
$key
][
'type'
]
==
'payment'
)
{
if
(
$links
[
$key
][
'type'
]
==
'payment'
)
{
...
@@ -547,7 +544,7 @@ if ($account || $_GET["ref"])
...
@@ -547,7 +544,7 @@ if ($account || $_GET["ref"])
print
' '
.
$paymentvatstatic
->
getNomUrl
(
2
);
print
' '
.
$paymentvatstatic
->
getNomUrl
(
2
);
}
}
else
if
(
$links
[
$key
][
'type'
]
==
'banktransfert'
)
{
else
if
(
$links
[
$key
][
'type'
]
==
'banktransfert'
)
{
/
*
Do not show this link (avoid confusion). Can already be accessed from transaction detail
*/
/
/
Do not show this link (avoid confusion). Can already be accessed from transaction detail
}
}
else
if
(
$links
[
$key
][
'type'
]
==
'member'
)
{
else
if
(
$links
[
$key
][
'type'
]
==
'member'
)
{
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/bank/search.php
+
76
−
2
View file @
2a3ed3d0
...
@@ -188,14 +188,88 @@ if ($resql)
...
@@ -188,14 +188,88 @@ if ($resql)
print
'<td align="left" nowrap="nowrap">'
.
dol_print_date
(
$db
->
jdate
(
$objp
->
do
),
"day"
)
.
" </td>
\n
"
;
print
'<td align="left" nowrap="nowrap">'
.
dol_print_date
(
$db
->
jdate
(
$objp
->
do
),
"day"
)
.
" </td>
\n
"
;
// Description
// Description
print
"<td><a href=
\"
ligne.php?rowid=
$objp->rowid
&account=
$objp->fk_account
\"
>"
;
print
"<td>"
;
//print $objp->label;
/* This bloc is same than in page compta/bank/account.php
// Show generic description
if (preg_match('/^\((.*)\)$/i',$objp->label,$reg))
{
// Generic description because between (). We show it after translating.
print $langs->trans($reg[1]);
}
else
{
print dol_trunc($objp->label,60);
}
// Add links after description
$links = $acct->get_url($objp->rowid);
foreach($links as $key=>$val)
{
if ($links[$key]['type']=='payment') {
$paymentstatic->id=$links[$key]['url_id'];
print ' '.$paymentstatic->getNomUrl(2);
}
else if ($links[$key]['type']=='payment_supplier') {
$paymentsupplierstatic->id=$links[$key]['url_id'];
$paymentsupplierstatic->ref=$links[$key]['url_id'];
print ' '.$paymentsupplierstatic->getNomUrl(2);
}
else if ($links[$key]['type']=='company') {
}
else if ($links[$key]['type']=='sc') { // This is waiting for card to link to payment_sc
$chargestatic->id=$links[$key]['url_id'];
$chargestatic->ref=$links[$key]['url_id'];
$chargestatic->lib=$langs->trans("SocialContribution");
print ' '.$chargestatic->getNomUrl(2);
}
else if ($links[$key]['type']=='payment_sc')
{
//print ' - ';
print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
//print $langs->trans("SocialContributionPayment");
print '</a>';
}
else if ($links[$key]['type']=='payment_vat')
{
$paymentvatstatic->id=$links[$key]['url_id'];
$paymentvatstatic->ref=$links[$key]['url_id'];
print ' '.$paymentvatstatic->getNomUrl(2);
}
else if ($links[$key]['type']=='banktransfert') {
// Do not show this link (avoid confusion). Can already be accessed from transaction detail
}
else if ($links[$key]['type']=='member') {
}
else {
//print ' - ';
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
if (preg_match('/^\((.*)\)$/i',$links[$key]['label'],$reg))
{
// Label generique car entre parentheses. On l'affiche en le traduisant
if ($reg[1]=='paiement') $reg[1]='Payment';
print $langs->trans($reg[1]);
}
else
{
print $links[$key]['label'];
}
print '</a>';
}
}
*/
print
"<a href=
\"
ligne.php?rowid=
$objp->rowid
&account=
$objp->fk_account
\"
>"
;
$reg
=
array
();
$reg
=
array
();
preg_match
(
'/\((.+)\)/i'
,
$objp
->
label
,
$reg
);
// Si texte entoure de parenthee on tente recherche de traduction
preg_match
(
'/\((.+)\)/i'
,
$objp
->
label
,
$reg
);
// Si texte entoure de parenthee on tente recherche de traduction
if
(
$reg
[
1
]
&&
$langs
->
trans
(
$reg
[
1
])
!=
$reg
[
1
])
print
$langs
->
trans
(
$reg
[
1
]);
if
(
$reg
[
1
]
&&
$langs
->
trans
(
$reg
[
1
])
!=
$reg
[
1
])
print
$langs
->
trans
(
$reg
[
1
]);
else
print
dol_trunc
(
$objp
->
label
,
40
);
else
print
dol_trunc
(
$objp
->
label
,
40
);
print
"</a> "
;
print
"</a> "
;
print
'</td>'
;
// Third party
// Third party
print
"<td>"
;
print
"<td>"
;
if
(
$objp
->
url_id
)
if
(
$objp
->
url_id
)
...
...
This diff is collapsed.
Click to expand it.
htdocs/fourn/paiement/fiche.php
+
6
−
6
View file @
2a3ed3d0
...
@@ -155,7 +155,7 @@ if (!empty($_POST['action']) && $_POST['action'] == 'update_date' && !empty($_PO
...
@@ -155,7 +155,7 @@ if (!empty($_POST['action']) && $_POST['action'] == 'update_date' && !empty($_PO
print
'<table class="border" width="100%">'
;
print
'<table class="border" width="100%">'
;
print
'<tr>'
;
print
'<tr>'
;
print
'<td valign="top" width="
140
" colspan="2">'
.
$langs
->
trans
(
'Ref'
)
.
'</td><td colspan="3">'
.
$paiement
->
id
.
'</td></tr>'
;
print
'<td valign="top" width="
20%
" colspan="2">'
.
$langs
->
trans
(
'Ref'
)
.
'</td><td colspan="3">'
.
$paiement
->
id
.
'</td></tr>'
;
//switch through edition options for date (only available when statut is -not 1- (=validated))
//switch through edition options for date (only available when statut is -not 1- (=validated))
if
(
empty
(
$_GET
[
'action'
])
||
$_GET
[
'action'
]
!=
'edit_date'
)
if
(
empty
(
$_GET
[
'action'
])
||
$_GET
[
'action'
]
!=
'edit_date'
)
...
@@ -172,7 +172,7 @@ if (empty($_GET['action']) || $_GET['action']!='edit_date')
...
@@ -172,7 +172,7 @@ if (empty($_GET['action']) || $_GET['action']!='edit_date')
else
else
{
{
print
'<tr>'
;
print
'<tr>'
;
print
'<td valign="top"
width="140"
colspan="2">'
.
$langs
->
trans
(
'Date'
)
.
'</td>'
;
print
'<td valign="top" colspan="2">'
.
$langs
->
trans
(
'Date'
)
.
'</td>'
;
print
'<td colspan="3">'
;
print
'<td colspan="3">'
;
print
'<form name="formsoc" method="post" action="'
.
DOL_URL_ROOT
.
'/fourn/paiement/fiche.php?id='
.
$paiement
->
id
.
'"><input type="hidden" name="action" value="update_date" />'
;
print
'<form name="formsoc" method="post" action="'
.
DOL_URL_ROOT
.
'/fourn/paiement/fiche.php?id='
.
$paiement
->
id
.
'"><input type="hidden" name="action" value="update_date" />'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'">'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'">'
;
...
@@ -204,7 +204,7 @@ if (empty($_GET['action']) || $_GET['action'] != 'edit_num')
...
@@ -204,7 +204,7 @@ if (empty($_GET['action']) || $_GET['action'] != 'edit_num')
else
else
{
{
print
'<tr>'
;
print
'<tr>'
;
print
'<td valign="top"
width="140"
colspan="2">'
.
$langs
->
trans
(
'Numero'
)
.
'</td>'
;
print
'<td valign="top" colspan="2">'
.
$langs
->
trans
(
'Numero'
)
.
'</td>'
;
print
'<td colspan="3">'
;
print
'<td colspan="3">'
;
print
'<form name="formsoc" method="post" action="'
.
DOL_URL_ROOT
.
'/fourn/paiement/fiche.php?id='
.
$paiement
->
id
.
'"><input type="hidden" name="action" value="update_num" />'
;
print
'<form name="formsoc" method="post" action="'
.
DOL_URL_ROOT
.
'/fourn/paiement/fiche.php?id='
.
$paiement
->
id
.
'"><input type="hidden" name="action" value="update_num" />'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'">'
;
print
'<input type="hidden" name="token" value="'
.
$_SESSION
[
'newtoken'
]
.
'">'
;
...
@@ -224,6 +224,8 @@ if ($conf->global->BILL_ADD_PAYMENT_VALIDATION)
...
@@ -224,6 +224,8 @@ if ($conf->global->BILL_ADD_PAYMENT_VALIDATION)
print
'<tr><td valign="top" colspan="2">'
.
$langs
->
trans
(
'Status'
)
.
'</td><td colspan="3">'
.
$paiement
->
getLibStatut
(
4
)
.
'</td></tr>'
;
print
'<tr><td valign="top" colspan="2">'
.
$langs
->
trans
(
'Status'
)
.
'</td><td colspan="3">'
.
$paiement
->
getLibStatut
(
4
)
.
'</td></tr>'
;
}
}
print
'<tr><td valign="top" colspan="2">'
.
$langs
->
trans
(
'Note'
)
.
'</td><td colspan="3">'
.
nl2br
(
$paiement
->
note
)
.
'</td></tr>'
;
if
(
$conf
->
banque
->
enabled
)
if
(
$conf
->
banque
->
enabled
)
{
{
if
(
$paiement
->
bank_account
)
if
(
$paiement
->
bank_account
)
...
@@ -236,15 +238,13 @@ if ($conf->banque->enabled)
...
@@ -236,15 +238,13 @@ if ($conf->banque->enabled)
$bankline
->
fetch
(
$paiement
->
bank_line
);
$bankline
->
fetch
(
$paiement
->
bank_line
);
print
'<tr>'
;
print
'<tr>'
;
print
'<td valign="top"
width="140"
colspan="2">'
.
$langs
->
trans
(
'BankAccount'
)
.
'</td>'
;
print
'<td valign="top" colspan="2">'
.
$langs
->
trans
(
'BankAccount'
)
.
'</td>'
;
print
'<td><a href="'
.
DOL_URL_ROOT
.
'/compta/bank/account.php?account='
.
$bank
->
id
.
'">'
.
img_object
(
$langs
->
trans
(
'ShowAccount'
),
'account'
)
.
' '
.
$bank
->
label
.
'</a></td>'
;
print
'<td><a href="'
.
DOL_URL_ROOT
.
'/compta/bank/account.php?account='
.
$bank
->
id
.
'">'
.
img_object
(
$langs
->
trans
(
'ShowAccount'
),
'account'
)
.
' '
.
$bank
->
label
.
'</a></td>'
;
print
'<td>'
.
$langs
->
trans
(
'BankLineConciliated'
)
.
'</td><td>'
.
yn
(
$bankline
->
rappro
)
.
'</td>'
;
print
'<td>'
.
$langs
->
trans
(
'BankLineConciliated'
)
.
'</td><td>'
.
yn
(
$bankline
->
rappro
)
.
'</td>'
;
print
'</tr>'
;
print
'</tr>'
;
}
}
}
}
print
'<tr><td valign="top" colspan="2">'
.
$langs
->
trans
(
'Note'
)
.
'</td><td colspan="3">'
.
nl2br
(
$paiement
->
note
)
.
'</td></tr>'
;
print
'</table>'
;
print
'</table>'
;
if
(
$mesg
)
print
'<br>'
.
$mesg
;
if
(
$mesg
)
print
'<br>'
.
$mesg
;
...
...
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