diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index cf41c8fdfd8911a65a67eb6bd568dc054a87546b..1a6908fb4b9cef32238db4a9b95de62a8e479348 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -497,10 +497,7 @@ if ($account || $_GET["ref"]) // Description print '<td>'; - - $links = $acct->get_url($objp->rowid); - - // Sgow generic description + // Show generic description if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { // Generic description because between (). We show it after translating. @@ -510,8 +507,8 @@ if ($account || $_GET["ref"]) { 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') { @@ -547,7 +544,7 @@ if ($account || $_GET["ref"]) print ' '.$paymentvatstatic->getNomUrl(2); } 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') { } diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 88ae567f2aac34ef6e3559c588764cbb386abc4b..87cda1f8588fe06db42f8bda67842712eab16df8 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -188,14 +188,88 @@ if ($resql) print '<td align="left" nowrap="nowrap">'.dol_print_date($db->jdate($objp->do),"day")." </td>\n"; // Description - print "<td><a href=\"ligne.php?rowid=$objp->rowid&account=$objp->fk_account\">"; - //print $objp->label; + print "<td>"; + + /* 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(); 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]); else print dol_trunc($objp->label,40); print "</a> "; + print '</td>'; + // Third party print "<td>"; if ($objp->url_id) diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 7459dc7a345983a421f31f786efb569e2fdb9016..c4a84e8e519d37af976bca5730dfe294416bf56e 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -155,7 +155,7 @@ if (!empty($_POST['action']) && $_POST['action'] == 'update_date' && !empty($_PO print '<table class="border" width="100%">'; 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)) if (empty($_GET['action']) || $_GET['action']!='edit_date') @@ -172,7 +172,7 @@ if (empty($_GET['action']) || $_GET['action']!='edit_date') else { 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 '<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'].'">'; @@ -204,7 +204,7 @@ if (empty($_GET['action']) || $_GET['action'] != 'edit_num') else { 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 '<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'].'">'; @@ -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('Note').'</td><td colspan="3">'.nl2br($paiement->note).'</td></tr>'; + if ($conf->banque->enabled) { if ($paiement->bank_account) @@ -236,15 +238,13 @@ if ($conf->banque->enabled) $bankline->fetch($paiement->bank_line); 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>'.$langs->trans('BankLineConciliated').'</td><td>'.yn($bankline->rappro).'</td>'; print '</tr>'; } } -print '<tr><td valign="top" colspan="2">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($paiement->note).'</td></tr>'; - print '</table>'; if ($mesg) print '<br>'.$mesg;