|
@@ -3,8 +3,9 @@
|
|
|
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
|
|
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
|
|
|
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
|
|
|
- * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
|
|
+ * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
|
|
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
|
|
|
+ * Copyright (C) 2017 Alexandre Spangaro <aspangaro@zendsi.com>
|
|
|
*
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
@@ -31,14 +32,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
|
|
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
|
|
|
|
|
|
$langs->load("bills");
|
|
|
$langs->load("compta");
|
|
|
|
|
|
// Security check
|
|
|
-$facid =GETPOST('facid','int');
|
|
|
-$socid =GETPOST('socid','int');
|
|
|
-$userid=GETPOST('userid','int');
|
|
|
+$facid = GETPOST('facid','int');
|
|
|
+$socid = GETPOST('socid','int');
|
|
|
+$userid = GETPOST('userid','int');
|
|
|
$day = GETPOST('day','int');
|
|
|
$month = GETPOST('month','int');
|
|
|
$year = GETPOST('year','int');
|
|
@@ -129,7 +131,7 @@ else
|
|
|
$sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
|
|
|
$sql.= " p.statut, p.num_paiement,";
|
|
|
$sql.= " c.code as paiement_code,";
|
|
|
- $sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.accountancy_journal as accountancy_journal,";
|
|
|
+ $sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
|
|
|
$sql.= " s.rowid as socid, s.nom as name";
|
|
|
// Add fields for extrafields
|
|
|
foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
|
|
@@ -329,7 +331,11 @@ if ($resql)
|
|
|
$accountstatic->label=$objp->blabel;
|
|
|
$accountstatic->number=$objp->number;
|
|
|
$accountstatic->account_number=$objp->account_number;
|
|
|
- $accountstatic->accountancy_journal=$objp->accountancy_journal;
|
|
|
+
|
|
|
+ $accountingjournal = new AccountingJournal($db);
|
|
|
+ $accountingjournal->fetch($objp->accountancy_journal);
|
|
|
+ $accountstatic->accountancy_journal = $accountingjournal->code;
|
|
|
+
|
|
|
print $accountstatic->getNomUrl(1);
|
|
|
}
|
|
|
else print ' ';
|