Fix: Link was not translated
This commit is contained in:
parent
8f62565aae
commit
97bfc98f02
@ -38,7 +38,7 @@ require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php");
|
|||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
if (!$user->rights->banque->lire)
|
if (!$user->rights->banque->lire)
|
||||||
accessforbidden();
|
accessforbidden();
|
||||||
|
|
||||||
|
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
@ -59,27 +59,27 @@ $mesg='';
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Action
|
* Action
|
||||||
*/
|
*/
|
||||||
$dateop=-1;
|
$dateop=-1;
|
||||||
|
|
||||||
if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
|
if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (price2num($_POST["credit"]) > 0)
|
if (price2num($_POST["credit"]) > 0)
|
||||||
{
|
{
|
||||||
$amount = price2num($_POST["credit"]);
|
$amount = price2num($_POST["credit"]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$amount = - price2num($_POST["debit"]);
|
$amount = - price2num($_POST["debit"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$dateop = dol_mktime(12,0,0,$_POST["opmonth"],$_POST["opday"],$_POST["opyear"]);
|
$dateop = dol_mktime(12,0,0,$_POST["opmonth"],$_POST["opday"],$_POST["opyear"]);
|
||||||
$operation=$_POST["operation"];
|
$operation=$_POST["operation"];
|
||||||
$num_chq=$_POST["num_chq"];
|
$num_chq=$_POST["num_chq"];
|
||||||
$label=$_POST["label"];
|
$label=$_POST["label"];
|
||||||
$cat1=$_POST["cat1"];
|
$cat1=$_POST["cat1"];
|
||||||
|
|
||||||
if (! $dateop) $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
|
if (! $dateop) $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
|
||||||
if (! $operation) $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Type"));
|
if (! $operation) $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Type"));
|
||||||
@ -87,17 +87,17 @@ if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user-
|
|||||||
|
|
||||||
if (! $mesg)
|
if (! $mesg)
|
||||||
{
|
{
|
||||||
$acct=new Account($db,$account);
|
$acct=new Account($db,$account);
|
||||||
$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
|
$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
|
||||||
if ($insertid > 0)
|
if ($insertid > 0)
|
||||||
{
|
{
|
||||||
Header("Location: account.php?account=" . $account);
|
Header("Location: account.php?account=" . $account);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dol_print_error($db,$acct->error);
|
dol_print_error($db,$acct->error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -113,8 +113,8 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"]=='yes' && $user->r
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
@ -271,8 +271,8 @@ if ($account || $_GET["ref"])
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search form
|
* Search form
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Define transaction list navigation string
|
// Define transaction list navigation string
|
||||||
$navig='';
|
$navig='';
|
||||||
@ -364,9 +364,9 @@ if ($account || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Affiche tableau des transactions bancaires
|
* Affiche tableau des transactions bancaires
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Ligne de titre tableau des ecritures
|
// Ligne de titre tableau des ecritures
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
@ -399,9 +399,9 @@ if ($account || $_GET["ref"])
|
|||||||
print "</form>\n";
|
print "</form>\n";
|
||||||
|
|
||||||
/* Another solution
|
/* Another solution
|
||||||
* create temporary table solde type=heap select amount from llx_bank limit 100 ;
|
* create temporary table solde type=heap select amount from llx_bank limit 100 ;
|
||||||
* select sum(amount) from solde ;
|
* select sum(amount) from solde ;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv,";
|
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv,";
|
||||||
$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
|
$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
|
||||||
@ -444,53 +444,53 @@ if ($account || $_GET["ref"])
|
|||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
$total = 0;
|
$total = 0;
|
||||||
$time = time();
|
$time = time();
|
||||||
|
|
||||||
$var=true;
|
$var=true;
|
||||||
|
|
||||||
$num = $db->num_rows($result);
|
$num = $db->num_rows($result);
|
||||||
$i = 0; $total = 0; $sep = 0;
|
$i = 0; $total = 0; $sep = 0;
|
||||||
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$objp = $db->fetch_object($result);
|
$objp = $db->fetch_object($result);
|
||||||
$total = $total + $objp->amount;
|
$total = $total + $objp->amount;
|
||||||
if ($i >= ($nbline - $viewline))
|
if ($i >= ($nbline - $viewline))
|
||||||
{
|
{
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|
||||||
if ($objp->do > $time && !$sep)
|
if ($objp->do > $time && !$sep)
|
||||||
{
|
{
|
||||||
$sep = 1 ;
|
$sep = 1 ;
|
||||||
print "<tr><td align=\"right\" colspan=\"6\"> </td>";
|
print "<tr><td align=\"right\" colspan=\"6\"> </td>";
|
||||||
print "<td align=\"right\" nowrap><b>".price($total - $objp->amount)."</b></td>";
|
print "<td align=\"right\" nowrap><b>".price($total - $objp->amount)."</b></td>";
|
||||||
print "<td> </td>";
|
print "<td> </td>";
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
|
|
||||||
print "<td nowrap>".dol_print_date($objp->do,"day")."</td>\n";
|
print "<td nowrap>".dol_print_date($objp->do,"day")."</td>\n";
|
||||||
|
|
||||||
print "<td nowrap> ".dol_print_date($objp->dv,"day")."</td>\n";
|
print "<td nowrap> ".dol_print_date($objp->dv,"day")."</td>\n";
|
||||||
|
|
||||||
print "<td nowrap> ".$langs->trans($objp->fk_type)." ".($objp->num_chq?$objp->num_chq:"")."</td>\n";
|
print "<td nowrap> ".$langs->trans($objp->fk_type)." ".($objp->num_chq?$objp->num_chq:"")."</td>\n";
|
||||||
|
|
||||||
// Description
|
// Description
|
||||||
print '<td>';
|
print '<td>';
|
||||||
|
|
||||||
$links = $acct->get_url($objp->rowid);
|
$links = $acct->get_url($objp->rowid);
|
||||||
|
|
||||||
$isbanktransfert=false;
|
$isbanktransfert=false;
|
||||||
foreach($links as $key=>$val) { if ($val['type']=='banktransfert') $isbanktransfert=true; }
|
foreach($links as $key=>$val) { if ($val['type']=='banktransfert') $isbanktransfert=true; }
|
||||||
$issocialcontrib=false;
|
$issocialcontrib=false;
|
||||||
foreach($links as $key=>$val) { if ($val['type']=='sc') $issocialcontrib=true; }
|
foreach($links as $key=>$val) { if ($val['type']=='sc') $issocialcontrib=true; }
|
||||||
|
|
||||||
$showlabel=true;
|
$showlabel=true;
|
||||||
//if (sizeof($links) == 0) $showlabel=true;
|
//if (sizeof($links) == 0) $showlabel=true;
|
||||||
//if ($isbanktransfert || $issocialcontrib) $showlabel=true;
|
//if ($isbanktransfert || $issocialcontrib) $showlabel=true;
|
||||||
if ($showlabel)
|
if ($showlabel)
|
||||||
{
|
{
|
||||||
if (eregi('^\((.*)\)$',$objp->label,$reg))
|
if (eregi('^\((.*)\)$',$objp->label,$reg))
|
||||||
{
|
{
|
||||||
// Genereic description because between (). We show it after translating.
|
// Genereic description because between (). We show it after translating.
|
||||||
@ -498,28 +498,29 @@ if ($account || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print dol_trunc($objp->label,60);
|
print dol_trunc($objp->label,60);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add links in description field
|
// Add links in description field
|
||||||
foreach($links as $key=>$val)
|
foreach($links as $key=>$val)
|
||||||
{
|
{
|
||||||
if ($links[$key]['type']=='payment') {
|
if ($links[$key]['type']=='payment') {
|
||||||
$paymentstatic->id=$links[$key]['url_id'];
|
$paymentstatic->id=$links[$key]['url_id'];
|
||||||
print ' '.$paymentstatic->getNomUrl(2);
|
print ' '.$paymentstatic->getNomUrl(2);
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='payment_supplier') {
|
else if ($links[$key]['type']=='payment_supplier') {
|
||||||
$paymentsupplierstatic->id=$links[$key]['url_id'];
|
$paymentsupplierstatic->id=$links[$key]['url_id'];
|
||||||
$paymentsupplierstatic->ref=$links[$key]['url_id'];
|
$paymentsupplierstatic->ref=$links[$key]['url_id'];
|
||||||
print ' '.$paymentsupplierstatic->getNomUrl(2);
|
print ' '.$paymentsupplierstatic->getNomUrl(2);
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='company') {
|
else if ($links[$key]['type']=='company') {
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='sc') { // This is waiting for card to link to payment_sc
|
else if ($links[$key]['type']=='sc') { // This is waiting for card to link to payment_sc
|
||||||
$chargestatic->id=$links[$key]['url_id'];
|
$chargestatic->id=$links[$key]['url_id'];
|
||||||
$chargestatic->ref=$links[$key]['url_id'];
|
$chargestatic->ref=$links[$key]['url_id'];
|
||||||
print ' '.$chargestatic->getNomUrl(2);
|
$chargestatic->lib=$langs->trans("SocialContribution");
|
||||||
|
print ' '.$chargestatic->getNomUrl(2);
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='payment_sc')
|
else if ($links[$key]['type']=='payment_sc')
|
||||||
{
|
{
|
||||||
@ -533,9 +534,9 @@ if ($account || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='payment_vat')
|
else if ($links[$key]['type']=='payment_vat')
|
||||||
{
|
{
|
||||||
$paymentvatstatic->id=$links[$key]['url_id'];
|
$paymentvatstatic->id=$links[$key]['url_id'];
|
||||||
$paymentvatstatic->ref=$links[$key]['url_id'];
|
$paymentvatstatic->ref=$links[$key]['url_id'];
|
||||||
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 */
|
||||||
@ -544,7 +545,7 @@ if ($account || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//print ' - ';
|
//print ' - ';
|
||||||
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
|
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
|
||||||
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
|
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
|
||||||
{
|
{
|
||||||
// Label générique car entre parenthèses. On l'affiche en le traduisant
|
// Label générique car entre parenthèses. On l'affiche en le traduisant
|
||||||
@ -553,111 +554,111 @@ if ($account || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print $links[$key]['label'];
|
print $links[$key]['label'];
|
||||||
}
|
}
|
||||||
print '</a>';
|
print '</a>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
|
|
||||||
// Add third party column
|
// Add third party column
|
||||||
print '<td>';
|
print '<td>';
|
||||||
foreach($links as $key=>$val)
|
foreach($links as $key=>$val)
|
||||||
{
|
{
|
||||||
if ($links[$key]['type']=='company') {
|
if ($links[$key]['type']=='company') {
|
||||||
$societestatic->id=$links[$key]['url_id'];
|
$societestatic->id=$links[$key]['url_id'];
|
||||||
$societestatic->nom=$links[$key]['label'];
|
$societestatic->nom=$links[$key]['label'];
|
||||||
print $societestatic->getNomUrl(1,'',16);
|
print $societestatic->getNomUrl(1,'',16);
|
||||||
}
|
}
|
||||||
/*else if ($links[$key]['type']=='sc') {
|
/*else if ($links[$key]['type']=='sc') {
|
||||||
$chargestatic->id=$links[$key]['url_id'];
|
$chargestatic->id=$links[$key]['url_id'];
|
||||||
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
|
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
|
||||||
{
|
{
|
||||||
if ($reg[1]=='socialcontribution') $reg[1]='SocialContribution';
|
if ($reg[1]=='socialcontribution') $reg[1]='SocialContribution';
|
||||||
$chargestatic->lib=$langs->trans($reg[1]);
|
$chargestatic->lib=$langs->trans($reg[1]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$chargestatic->lib=$links[$key]['label'];
|
$chargestatic->lib=$links[$key]['label'];
|
||||||
}
|
}
|
||||||
print $chargestatic->getNomUrl(1,'',16);
|
print $chargestatic->getNomUrl(1,'',16);
|
||||||
}*/
|
}*/
|
||||||
else if ($links[$key]['type']=='member') {
|
else if ($links[$key]['type']=='member') {
|
||||||
$memberstatic->id=$links[$key]['url_id'];
|
$memberstatic->id=$links[$key]['url_id'];
|
||||||
$memberstatic->ref=$links[$key]['label'];
|
$memberstatic->ref=$links[$key]['label'];
|
||||||
print $memberstatic->getNomUrl(1,16,'card');
|
print $memberstatic->getNomUrl(1,16,'card');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
if ($objp->amount < 0)
|
if ($objp->amount < 0)
|
||||||
{
|
{
|
||||||
print "<td align=\"right\" nowrap>".price($objp->amount * -1)."</td><td> </td>\n";
|
print "<td align=\"right\" nowrap>".price($objp->amount * -1)."</td><td> </td>\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "<td> </td><td align=\"right\" nowrap> ".price($objp->amount)."</td>\n";
|
print "<td> </td><td align=\"right\" nowrap> ".price($objp->amount)."</td>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action != 'search')
|
if ($action != 'search')
|
||||||
{
|
{
|
||||||
if ($total >= 0)
|
if ($total >= 0)
|
||||||
{
|
{
|
||||||
print '<td align="right" nowrap> '.price($total).'</td>';
|
print '<td align="right" nowrap> '.price($total).'</td>';
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print '<td align="right" class="error" nowrap> '.price($total).'</td>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print '<td align="right">-</td>';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Relevé rappro ou lien edition
|
|
||||||
if ($objp->rappro && $acct->type != 2) // Si non compte cash
|
|
||||||
{
|
|
||||||
print "<td align=\"center\" nowrap>";
|
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
|
||||||
print img_view();
|
|
||||||
print '</a>';
|
|
||||||
print " ";
|
|
||||||
print "<a href=\"releve.php?num=$objp->num_releve&account=$acct->id\">$objp->num_releve</a>";
|
|
||||||
print "</td>";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print '<td align="center">';
|
|
||||||
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
|
|
||||||
{
|
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
|
||||||
print img_edit();
|
|
||||||
print '</a>';
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
print '<td align="right" class="error" nowrap> '.price($total).'</td>';
|
||||||
print img_view();
|
}
|
||||||
print '</a>';
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print '<td align="right">-</td>';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Relevé rappro ou lien edition
|
||||||
|
if ($objp->rappro && $acct->type != 2) // Si non compte cash
|
||||||
|
{
|
||||||
|
print "<td align=\"center\" nowrap>";
|
||||||
|
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
||||||
|
print img_view();
|
||||||
|
print '</a>';
|
||||||
|
print " ";
|
||||||
|
print "<a href=\"releve.php?num=$objp->num_releve&account=$acct->id\">$objp->num_releve</a>";
|
||||||
|
print "</td>";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print '<td align="center">';
|
||||||
|
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
|
||||||
|
{
|
||||||
|
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
||||||
|
print img_edit();
|
||||||
|
print '</a>';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
||||||
|
print img_view();
|
||||||
|
print '</a>';
|
||||||
}
|
}
|
||||||
print ' ';
|
print ' ';
|
||||||
if ($user->rights->banque->modifier)
|
if ($user->rights->banque->modifier)
|
||||||
{
|
{
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?action=delete&rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?action=delete&rowid='.$objp->rowid.'&account='.$acct->id.'&page='.$page.'">';
|
||||||
print img_delete();
|
print img_delete();
|
||||||
print '</a>';
|
print '</a>';
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Affichage total
|
// Affichage total
|
||||||
if ($page == 0 && ! $mode_search)
|
if ($page == 0 && ! $mode_search)
|
||||||
@ -680,8 +681,8 @@ if ($account || $_GET["ref"])
|
|||||||
print "\n</div>\n";
|
print "\n</div>\n";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Boutons actions
|
* Boutons actions
|
||||||
*/
|
*/
|
||||||
if ($_GET["action"] != 'addline' && $_GET["action"] != 'delete')
|
if ($_GET["action"] != 'addline' && $_GET["action"] != 'delete')
|
||||||
{
|
{
|
||||||
print '<div class="tabsAction">';
|
print '<div class="tabsAction">';
|
||||||
|
|||||||
@ -25,6 +25,13 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/chargesociales.class.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php");
|
||||||
|
|
||||||
$langs->load("banks");
|
$langs->load("banks");
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
@ -111,6 +118,13 @@ $form=new Form($db);
|
|||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
|
$societestatic=new Societe($db);
|
||||||
|
$chargestatic=new ChargeSociales($db);
|
||||||
|
$memberstatic=new Adherent($db);
|
||||||
|
$paymentstatic=new Paiement($db);
|
||||||
|
$paymentsupplierstatic=new PaiementFourn($db);
|
||||||
|
$paymentvatstatic=new TVA($db);
|
||||||
|
|
||||||
$acct = new Account($db);
|
$acct = new Account($db);
|
||||||
$acct->fetch($_GET["account"]);
|
$acct->fetch($_GET["account"]);
|
||||||
|
|
||||||
@ -230,26 +244,14 @@ if ($resql)
|
|||||||
if (! $newline) print ' - ';
|
if (! $newline) print ' - ';
|
||||||
else print '<br>';
|
else print '<br>';
|
||||||
if ($links[$key]['type']=='payment') {
|
if ($links[$key]['type']=='payment') {
|
||||||
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
|
$paymentstatic->id=$links[$key]['url_id'];
|
||||||
print img_object($langs->trans('ShowPayment'),'payment').' ';
|
print ' '.$paymentstatic->getNomUrl(2);
|
||||||
print $langs->trans("Payment");
|
|
||||||
print '</a>';
|
|
||||||
$newline=0;
|
$newline=0;
|
||||||
}
|
}
|
||||||
elseif ($links[$key]['type']=='payment_supplier') {
|
elseif ($links[$key]['type']=='payment_supplier') {
|
||||||
print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$links[$key]['url_id'].'">';
|
$paymentsupplierstatic->id=$links[$key]['url_id'];
|
||||||
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
|
$paymentsupplierstatic->ref=$links[$key]['label'];
|
||||||
{
|
print ' '.$paymentsupplierstatic->getNomUrl(1);
|
||||||
// Label générique car entre parenthèses. On l'affiche en le traduisant
|
|
||||||
if ($reg[1]=='paiement') $reg[1]='Payment';
|
|
||||||
print img_object($langs->trans('ShowPayment'),'payment').' ';
|
|
||||||
print $langs->trans($reg[1]);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print $links[$key]['label'];
|
|
||||||
}
|
|
||||||
print '</a>';
|
|
||||||
$newline=0;
|
$newline=0;
|
||||||
}
|
}
|
||||||
elseif ($links[$key]['type']=='company') {
|
elseif ($links[$key]['type']=='company') {
|
||||||
@ -260,16 +262,33 @@ if ($resql)
|
|||||||
$newline=0;
|
$newline=0;
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='sc') {
|
else if ($links[$key]['type']=='sc') {
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
|
$chargestatic->id=$links[$key]['url_id'];
|
||||||
print img_object($langs->trans('ShowBill'),'bill').' ';
|
$chargestatic->ref=$links[$key]['url_id'];
|
||||||
print $langs->trans("SocialContribution");
|
$chargestatic->lib=$langs->trans("SocialContribution");
|
||||||
print '</a>';
|
print ' '.$chargestatic->getNomUrl(1);
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='payment_sc') {
|
else if ($links[$key]['type']=='payment_sc')
|
||||||
|
{
|
||||||
|
//print ' - ';
|
||||||
|
/*
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/sociales/xxx.php?id='.$links[$key]['url_id'].'">';
|
print '<a href="'.DOL_URL_ROOT.'/compta/sociales/xxx.php?id='.$links[$key]['url_id'].'">';
|
||||||
print img_object($langs->trans('ShowPayment'),'payment').' ';
|
//print img_object($langs->trans('ShowPayment'),'payment').' ';
|
||||||
print $langs->trans("SocialContributionPayment");
|
print $langs->trans("SocialContributionPayment");
|
||||||
print '</a>';
|
print '</a>';
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
else if ($links[$key]['type']=='payment_vat')
|
||||||
|
{
|
||||||
|
$paymentvatstatic->id=$links[$key]['url_id'];
|
||||||
|
$paymentvatstatic->ref=$links[$key]['url_id'];
|
||||||
|
$paymentvatstatic->ref=$langs->trans("VATPayment");
|
||||||
|
print ' '.$paymentvatstatic->getNomUrl(1);
|
||||||
|
}
|
||||||
|
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 if ($links[$key]['type']=='member') {
|
else if ($links[$key]['type']=='member') {
|
||||||
print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
|
print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
|
||||||
@ -277,16 +296,20 @@ if ($resql)
|
|||||||
print $links[$key]['label'];
|
print $links[$key]['label'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='banktransfert') {
|
else {
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$links[$key]['url_id'].'">';
|
//print ' - ';
|
||||||
print img_object($langs->trans('ShowTransaction'),'payment').' ';
|
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
|
||||||
print $langs->trans("TransactionOnTheOtherAccount");
|
if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
|
||||||
|
{
|
||||||
|
// Label générique car entre parenthèses. 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>';
|
||||||
}
|
|
||||||
else {
|
|
||||||
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
|
|
||||||
print $links[$key]['label'];
|
|
||||||
print '</a>';
|
|
||||||
$newline=0;
|
$newline=0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -482,11 +482,20 @@ class PaiementFourn
|
|||||||
$lien = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$this->id.'">';
|
$lien = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$this->id.'">';
|
||||||
$lienfin='</a>';
|
$lienfin='</a>';
|
||||||
|
|
||||||
|
$text=$this->ref; // Sometimes ref contains label
|
||||||
|
if (eregi('^\((.*)\)$',$text,$reg))
|
||||||
|
{
|
||||||
|
// Label générique car entre parenthèses. On l'affiche en le traduisant
|
||||||
|
if ($reg[1]=='paiement') $reg[1]='Payment';
|
||||||
|
$text=$langs->trans($reg[1]);
|
||||||
|
}
|
||||||
|
|
||||||
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
|
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
|
||||||
if ($withpicto && $withpicto != 2) $result.=' ';
|
if ($withpicto && $withpicto != 2) $result.=' ';
|
||||||
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
|
if ($withpicto != 2) $result.=$lien.$text.$lienfin;
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Updates the payment number
|
* \brief Updates the payment number
|
||||||
* \param string New num
|
* \param string New num
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user