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

Ajout du lien dans bank_url entre les 2 ecritures d'un virement

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-29 23:42:30 +00:00
parent 5d9b8cef9d
commit bd46e7da6f
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/compta/bank/account.php
View File

@ -497,6 +497,15 @@ if ($account > 0)
print $langs->trans("SocialContributionPayment"); print $langs->trans("SocialContributionPayment");
print '</a>'; print '</a>';
} }
else if ($links[$key]['type']=='banktransfert') {
/* Do not show this link (avoid confusion). Can be accessed from transaction detail.
print ' - ';
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$links[$key]['url_id'].'">';
//print img_object($langs->trans('ShowPayment'),'payment').' ';
print $langs->trans("TransactionWithOtherAccount");
print '</a>';
*/
}
else if ($links[$key]['type']=='member') { else if ($links[$key]['type']=='member') {
} }
else { else {

25
htdocs/compta/bank/rappro.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -258,6 +257,30 @@ if ($resql)
print '</a>'; print '</a>';
$newline=0; $newline=0;
} }
else if ($links[$key]['type']=='sc') {
print '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowBill'),'bill').' ';
print $langs->trans("SocialContribution");
print '</a>';
}
else if ($links[$key]['type']=='payment_sc') {
print '<a href="'.DOL_URL_ROOT.'/compta/sociales/xxx.php?id='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowPayment'),'payment').' ';
print $langs->trans("SocialContributionPayment");
print '</a>';
}
else if ($links[$key]['type']=='member') {
print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowMember'),'user').' ';
print $links[$key]['label'];
print '</a>';
}
else if ($links[$key]['type']=='banktransfert') {
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowTransaction'),'payment').' ';
print $langs->trans("TransactionOnTheOtherAccount");
print '</a>';
}
else { else {
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">'; print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
print $links[$key]['label']; print $links[$key]['label'];

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

@ -111,3 +111,4 @@ BankMovements=Movements
CashBudget=Cash budget CashBudget=Cash budget
ExportDataset_banque_1=Bank transactions and account statement ExportDataset_banque_1=Bank transactions and account statement
TransactionOnTheOtherAccount=Transaction on the other account TransactionOnTheOtherAccount=Transaction on the other account
TransactionWithOtherAccount=Account transfert

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

@ -110,4 +110,5 @@ ThisWillAlsoDeleteBankRecord=Ceci supprimera aussi les
BankMovements=Mouvements BankMovements=Mouvements
CashBudget=Budget de trésorerie CashBudget=Budget de trésorerie
ExportDataset_banque_1=Transaction bancaire et relevé ExportDataset_banque_1=Transaction bancaire et relevé
TransactionOnTheOtherAccount=Transaction sur l'autre compte TransactionOnTheOtherAccount=Transaction sur l'autre compte
TransactionWithOtherAccount=Transfert de compte