diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 5f064a07465ab..e16c822db9bbc 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -373,11 +373,10 @@
print '
';
if (! empty($conf->accounting->enabled))
{
- $accountancyaccount = new AccountingAccount($db);
- $accountancyaccount->fetch('',$object->accountancy_code);
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('',$object->accountancy_code);
- print $accountancyaccount->getNomUrl(1);
- // print length_accountg($object->accountancy_code);
+ print $accountingaccount->getNomUrl(0,1,1,'',1);
} else {
print $object->accountancy_code;
}
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 5b2488cc5e8f4..539b9ac24f2b5 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -17,14 +17,16 @@
*/
/**
- * \file htdocs/compta/bank/various_payment/index.php
+ * \file htdocs/compta/bank/various_payment/index.php
* \ingroup bank
- * \brief List of various payments
+ * \brief List of various payments
*/
require '../../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
$langs->load("compta");
$langs->load("banks");
@@ -90,8 +92,8 @@
$variousstatic = new PaymentVarious($db);
$accountstatic = new Account($db);
-$sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
+$sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank, v.accountancy_code,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
$sql.= " pst.code as payment_code";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
@@ -113,7 +115,6 @@
}
$sql.= $db->order($sortfield,$sortorder);
-//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, v.rowid, v.fk_user, v.amount, v.label, v.datev, v.fk_typepayment, v.num_payment, pst.code";
$totalnboflines=0;
$result=$db->query($sql);
if ($result)
@@ -156,24 +157,30 @@
print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"v.datep","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("AccountAccounting"),$_SERVER["PHP_SELF"],"v.accountancy_code","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Sens"),$_SERVER["PHP_SELF"],"v.sens","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
print "\n";
print ' | ';
+
// Ref
print '';
print '';
print ' | ';
+
// Label
print ' | ';
+
// Date
print ' | ';
+
// Type
print '';
$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
print ' | ';
+
// Account
if (! empty($conf->banque->enabled))
{
@@ -181,8 +188,13 @@
$form->select_comptes($search_account,'search_account',0,'',1);
print '';
}
+
+ // Accounting account
+ if (! empty($conf->accounting->enabled)) print ' | ';
+
// Amount
print ' | ';
+
// Sens
print ' | ';
@@ -201,34 +213,55 @@
$variousstatic->id=$obj->rowid;
$variousstatic->ref=$obj->rowid;
+
// Ref
print "".$variousstatic->getNomUrl(1)." | \n";
+
// Label payment
print "".dol_trunc($obj->label,40)." | \n";
+
// Date payment
print ''.dol_print_date($db->jdate($obj->datep),'day')." | \n";
+
// Type
print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.' | ';
+
// Account
if (! empty($conf->banque->enabled))
{
print '';
if ($obj->fk_bank > 0)
{
- //$accountstatic->fetch($obj->fk_bank);
$accountstatic->id=$obj->bid;
$accountstatic->ref=$obj->bref;
$accountstatic->number=$obj->bnumber;
- $accountstatic->accountancy_number=$obj->account_number;
- $accountstatic->fk_accountancy_journal=$obj->fk_accountancy_journal;
+
+ if (! empty($conf->accounting->enabled)) {
+ $accountstatic->account_number=$obj->bank_account_number;
+
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($obj->accountancy_journal);
+ $accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+ }
+
$accountstatic->label=$obj->blabel;
print $accountstatic->getNomUrl(1);
}
else print ' ';
print ' | ';
}
+
+ // Accounting account
+ if (! empty($conf->accounting->enabled)) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('',$obj->accountancy_code);
+
+ print ''.$accountingaccount->getNomUrl(0,1,1,'',1).' | ';
+ }
+
// Amount
print "".price($obj->amount)." | ";
+
// Sens
if ($obj->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
print "".$sens." | ";
@@ -240,7 +273,7 @@
$i++;
}
- $colspan=4;
+ $colspan=5;
if (! empty($conf->banque->enabled)) $colspan++;
print '
';
print ''.$langs->trans("Total").' | ';