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

Merge pull request #1864 from aspangaro/develop-accounting

Browse Source 
Patch Accounting Expert module
This commit is contained in:
Juanjo Menent 2014-09-05 09:06:34 +02:00
commit 5b34897927
26 changed files with 160 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/accountancy/admin/account.php
View File

@ -22,21 +22,12 @@
* \brief List accounting account * \brief List accounting account
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/accountancy/class/accountingaccount.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

52
htdocs/accountancy/admin/card.php
View File

@ -22,20 +22,12 @@
* \ingroup Accounting Expert * \ingroup Accounting Expert
* \brief Card accounting account * \brief Card accounting account
*/ */
$res = @include ("../main.inc.php"); require '../../main.inc.php';
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/accountancy/class/accountingaccount.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
// Langs // Langs
$langs->load("bills"); $langs->load("bills");
@ -53,7 +45,8 @@ if (!$user->admin)
$accounting = new AccountingAccount($db); $accounting = new AccountingAccount($db);
// Action // Action
if ($action == 'add') { if ($action == 'add')
{
$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS; $sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
dol_syslog('accountancy/admin/card.php:: $sql=' . $sql); dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
@ -82,7 +75,9 @@ if ($action == 'add') {
} }
} }
Header("Location: account.php"); Header("Location: account.php");
} elseif ($action == 'edit') { }
else if ($action == 'edit')
{
if (! GETPOST('cancel', 'alpha')) { if (! GETPOST('cancel', 'alpha')) {
$result = $accounting->fetch($id); $result = $accounting->fetch($id);
@ -111,8 +106,9 @@ if ($action == 'add') {
header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
exit(); exit();
} }
} else if ($action == 'delete') { }
else if ($action == 'delete')
{
$result = $accounting->fetch($id); $result = $accounting->fetch($id);
if (! empty($accounting->id)) { if (! empty($accounting->id)) {
@ -137,7 +133,8 @@ llxheader('', $langs->trans('AccountAccounting'));
$form = new Form($db); $form = new Form($db);
$htmlacc = new FormVentilation($db); $htmlacc = new FormVentilation($db);
if ($action == 'create') { if ($action == 'create')
{
print_fiche_titre($langs->trans('NewAccount')); print_fiche_titre($langs->trans('NewAccount'));
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n"; print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@ -169,16 +166,19 @@ if ($action == 'create') {
print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '"></center'; print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '"></center';
print '</form>'; print '</form>';
} else if ($id) { }
else if ($id)
{
$rowid = $id; $rowid = $id;
$account = $accounting->fetch($rowid); $account = $accounting->fetch($rowid);
if ($account > 0) { if ($account > 0) {
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
$head = account_prepare_head($accounting); $head = accounting_prepare_head($accounting);
if ($action == 'update') { if ($action == 'update')
{
// WYSIWYG Editor // WYSIWYG Editor
$htmlacc = new FormVentilation($db); $htmlacc = new FormVentilation($db);
@ -224,7 +224,9 @@ if ($action == 'create') {
print '</form>'; print '</form>';
print '</div>'; print '</div>';
} else { }
else
{
$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>'; $linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';
dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr'); dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
@ -268,8 +270,8 @@ if ($action == 'create') {
print '</div>'; print '</div>';
/* /*
* Barre d'actions * Barre d'actions
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
@ -287,7 +289,9 @@ if ($action == 'create') {
print '</div>'; print '</div>';
} }
} else { }
else
{
dol_print_error($db); dol_print_error($db);
} }
} }

15
htdocs/accountancy/admin/export.php
View File

@ -24,19 +24,10 @@
* \brief Setup page to configure accounting expert module * \brief Setup page to configure accounting expert module
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/admin.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
$langs->load("compta"); $langs->load("compta");
@ -97,7 +88,7 @@ $form = new Form($db);
print_fiche_titre($langs->trans('ConfigAccountingExpert')); print_fiche_titre($langs->trans('ConfigAccountingExpert'));
$head = admin_account_prepare_head(null); $head = admin_accounting_prepare_head(null);
dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron'); dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');

17
htdocs/accountancy/admin/importaccounts.php
View File

@ -23,20 +23,13 @@
* \ingroup Accounting Expert * \ingroup Accounting Expert
* \brief Page import accounting account * \brief Page import accounting account
*/ */
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class require '../../main.inc.php';
// Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/accountancy/class/accountingaccount.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
// langs // langs
$langs->load("compta"); $langs->load("compta");

17
htdocs/accountancy/admin/index.php
View File

@ -26,19 +26,10 @@
* \brief Setup page to configure accounting expert module * \brief Setup page to configure accounting expert module
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/admin.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
$langs->load("compta"); $langs->load("compta");
@ -157,7 +148,7 @@ $form = new Form($db);
print_fiche_titre($langs->trans('ConfigAccountingExpert')); print_fiche_titre($langs->trans('ConfigAccountingExpert'));
$head = admin_account_prepare_head($accounting); $head = admin_accounting_prepare_head($accounting);
dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron'); dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');
@ -264,6 +255,7 @@ foreach ($list as $key)
print '</td></tr>'; print '</td></tr>';
} }
$var = ! $var;
print "<tr " . $bc[$var] . ">"; print "<tr " . $bc[$var] . ">";
print '<td width="80%">' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>'; print '<td width="80%">' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>';
if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) { if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
@ -277,6 +269,7 @@ if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
} }
print '</tr>'; print '</tr>';
$var = ! $var;
print "<tr " . $bc[$var] . ">"; print "<tr " . $bc[$var] . ">";
print '<td width="80%">' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>'; print '<td width="80%">' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>';
if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) { if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {

17
htdocs/accountancy/admin/journaux.php
View File

@ -25,21 +25,12 @@
* \brief Setup page to configure accounting expert module * \brief Setup page to configure accounting expert module
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/admin.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/core/lib/bank.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("accountancy"); $langs->load("accountancy");
@ -91,7 +82,7 @@ $form = new Form($db);
print_fiche_titre($langs->trans('ConfigAccountingExpert')); print_fiche_titre($langs->trans('ConfigAccountingExpert'));
$head = admin_account_prepare_head(null); $head = admin_accounting_prepare_head(null);
dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron'); dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');

15
htdocs/accountancy/bookkeeping/balancebymonth.php
View File

@ -24,19 +24,10 @@
* \brief Balance by month * \brief Balance by month
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
// Langs // Langs

13
htdocs/accountancy/bookkeeping/card.php
View File

@ -23,19 +23,10 @@
* \brief Page to show account * \brief Page to show account
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("accountancy/class/bookkeeping.class.php"); require_once DOL_DOCUMENT_ROOT.'accountancy/class/bookkeeping.class.php';
// Langs // Langs
$langs->load("accounting"); $langs->load("accounting");

18
htdocs/accountancy/bookkeeping/list.php
View File

@ -24,21 +24,13 @@
* \brief List operation of book keeping * \brief List operation of book keeping
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/accountancy/class/html.formventilation.class.php");
dol_include_once("/accountancy/class/bookkeeping.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
$page = GETPOST("page"); $page = GETPOST("page");
$sortorder = GETPOST("sortorder"); $sortorder = GETPOST("sortorder");

13
htdocs/accountancy/bookkeeping/listbyyear.php
View File

@ -24,19 +24,10 @@
* \brief Book keeping by year * \brief Book keeping by year
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
// Langs // Langs

6
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -48,6 +48,7 @@ class AccountingAccount
* @param DoliDB $db Database handle * @param DoliDB $db Database handle
*/ */
function __construct($db) function __construct($db)
{ {
$this->db = $db; $this->db = $db;
} }
@ -290,7 +291,7 @@ class AccountingAccount
// // Call triggers // // Call triggers
// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; // include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
// $interface=new Interfaces($this->db); // $interface=new Interfaces($this->db);
// $result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); // $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
// if ($result < 0) { $error++; $this->errors=$interface->errors; } // if ($result < 0) { $error++; $this->errors=$interface->errors; }
// // End call triggers // // End call triggers
} }
@ -331,7 +332,8 @@ class AccountingAccount
* @param int $id of record * @param int $id of record
* @return void * @return void
*/ */
function info($id) { function info($id)
{
$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms'; $sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accountingaccount as a'; $sql .= ' FROM ' . MAIN_DB_PREFIX . 'accountingaccount as a';
$sql .= ' WHERE a.rowid = ' . $id; $sql .= ' WHERE a.rowid = ' . $id;

17
htdocs/accountancy/customer/card.php
View File

@ -23,20 +23,11 @@
* \brief Card customer ventilation * \brief Card customer ventilation
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/compta/facture/class/facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
// Langs // Langs
$langs->load("bills"); $langs->load("bills");

16
htdocs/accountancy/customer/index.php
View File

@ -23,19 +23,11 @@
* \ingroup Accounting Expert * \ingroup Accounting Expert
* \brief Page accueil clients ventilation comptable * \brief Page accueil clients ventilation comptable
*/ */
// Dolibarr environment
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class require '../../main.inc.php';
dol_include_once("/core/lib/date.lib.php");
// Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

17
htdocs/accountancy/customer/lines.php
View File

@ -25,21 +25,12 @@
* \brief Page of detail of the lines of ventilation of invoices customers * \brief Page of detail of the lines of ventilation of invoices customers
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
dol_include_once("/compta/facture/class/facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
dol_include_once("/product/class/product.class.php"); require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
// langs // langs
$langs->load("bills"); $langs->load("bills");

19
htdocs/accountancy/customer/list.php
View File

@ -24,21 +24,12 @@
* \brief Ventilation page from customers invoices * \brief Ventilation page from customers invoices
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/compta/facture/class/facture.class.php"); require_once DOL_DOCUMENT_ROOT.'compta/facture/class/facture.class.php';
dol_include_once("/product/class/product.class.php"); require_once DOL_DOCUMENT_ROOT.'product/class/product.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'accountancy/class/html.formventilation.class.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

19
htdocs/accountancy/journal/bankjournal.php
View File

@ -28,16 +28,7 @@
* \brief Page with sells journal * \brief Page with sells journal
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
@ -49,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
@ -129,6 +121,7 @@ $paymentsupplierstatic = new PaiementFourn($db);
$societestatic = new Societe($db); $societestatic = new Societe($db);
$chargestatic = new ChargeSociales($db); $chargestatic = new ChargeSociales($db);
$paymentvatstatic = new TVA($db); $paymentvatstatic = new TVA($db);
$paymentsalstatic = new PaymentSalary($db);
dol_syslog("accountancy/journal/bankjournal.php:: sql=" . $sql, LOG_DEBUG); dol_syslog("accountancy/journal/bankjournal.php:: sql=" . $sql, LOG_DEBUG);
$result = $db->query($sql); $result = $db->query($sql);
@ -228,6 +221,12 @@ if ($result) {
$paymentvatstatic->ref = $links[$key]['url_id']; $paymentvatstatic->ref = $links[$key]['url_id'];
$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2); $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
$tabtp[$obj->rowid][$cpttva] += $obj->amount; $tabtp[$obj->rowid][$cpttva] += $obj->amount;
} else if ($links[$key]['type'] == 'payment_salary') {
$paymentsalstatic->id = $links[$key]['url_id'];
$paymentsalstatic->ref = $links[$key]['url_id'];
$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
$tabtp[$obj->rowid][$cptsociale] += $obj->amount;
} else if ($links[$key]['type'] == 'banktransfert') { } else if ($links[$key]['type'] == 'banktransfert') {
$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2); $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);

37
htdocs/accountancy/journal/cashjournal.php
View File

@ -28,31 +28,22 @@
* \brief Page with cash journal * \brief Page with cash journal
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/report.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
dol_include_once("/core/lib/bank.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/societe/class/societe.class.php"); require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
dol_include_once("/adherents/class/adherent.class.php"); require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
dol_include_once("/compta/sociales/class/chargesociales.class.php"); require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
dol_include_once("/compta/paiement/class/paiement.class.php"); require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
dol_include_once("/compta/tva/class/tva.class.php"); require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
dol_include_once("/fourn/class/paiementfourn.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
dol_include_once("/fourn/class/fournisseur.facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
dol_include_once("/fourn/class/fournisseur.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
dol_include_once("/accountancy/class/bookkeeping.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
// Langs // Langs
$langs->load("companies"); $langs->load("companies");

13
htdocs/accountancy/journal/index.php
View File

@ -24,18 +24,9 @@
* \brief Index * \brief Index
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Langs // Langs
$langs->load("compta"); $langs->load("compta");
$langs->load("bills"); $langs->load("bills");
$langs->load("other"); $langs->load("other");

23
htdocs/accountancy/journal/purchasesjournal.php
View File

@ -27,25 +27,16 @@
* \brief Page with purchases journal * \brief Page with purchases journal
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/report.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/fourn/class/fournisseur.facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
dol_include_once("/fourn/class/fournisseur.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
dol_include_once("/accountancy/class/bookkeeping.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
dol_include_once("/accountancy/class/accountingaccount.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

25
htdocs/accountancy/journal/sellsjournal.php
View File

@ -28,25 +28,16 @@
* \brief Page with sells journal * \brief Page with sells journal
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/report.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
dol_include_once("/compta/facture/class/facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
dol_include_once("/societe/class/client.class.php"); require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
dol_include_once("/accountancy/class/bookkeeping.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
dol_include_once("/accountancy/class/accountingaccount.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

17
htdocs/accountancy/supplier/card.php
View File

@ -25,20 +25,11 @@
* \brief Card supplier ventilation * \brief Card supplier ventilation
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/fourn/class/fournisseur.facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

17
htdocs/accountancy/supplier/index.php
View File

@ -23,19 +23,10 @@
* \brief Page accueil ventilation * \brief Page accueil ventilation
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");
@ -50,7 +41,7 @@ if ($user->societe_id > 0)
if (! $user->rights->accounting->access) if (! $user->rights->accounting->access)
accessforbidden(); accessforbidden();
// Filter // Filter
$year = $_GET["year"]; $year = $_GET["year"];
if ($year == 0) { if ($year == 0) {
$year_current = strftime("%Y", time()); $year_current = strftime("%Y", time());

19
htdocs/accountancy/supplier/lines.php
View File

@ -26,22 +26,13 @@
* \brief Page of detail of the lines of ventilation of invoices suppliers * \brief Page of detail of the lines of ventilation of invoices suppliers
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
dol_include_once("/fourn/class/fournisseur.facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
dol_include_once("/product/class/product.class.php"); require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
dol_include_once("/core/lib/date.lib.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

19
htdocs/accountancy/supplier/list.php
View File

@ -24,21 +24,12 @@
* \brief Page de ventilation des lignes de facture * \brief Page de ventilation des lignes de facture
*/ */
// Dolibarr environment require '../../main.inc.php';
$res = @include ("../main.inc.php");
if (! $res && file_exists("../main.inc.php"))
$res = @include ("../main.inc.php");
if (! $res && file_exists("../../main.inc.php"))
$res = @include ("../../main.inc.php");
if (! $res && file_exists("../../../main.inc.php"))
$res = @include ("../../../main.inc.php");
if (! $res)
die("Include of main fails");
// Class // Class
dol_include_once("/fourn/class/fournisseur.facture.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
dol_include_once("/fourn/class/fournisseur.product.class.php"); require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
dol_include_once("/accountancy/class/html.formventilation.class.php"); require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
// Langs // Langs
$langs->load("compta"); $langs->load("compta");

1
htdocs/admin/index.php
View File

@ -25,6 +25,7 @@ require '../main.inc.php';
$langs->load("admin"); $langs->load("admin");
$langs->load("companies"); $langs->load("companies");
$langs->load("accountancy");
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();

33
htdocs/core/menus/standard/eldy.lib.php
View File

@ -501,7 +501,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto,1); $newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto,1);
$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"),1); $newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"),1);
$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1); $newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1);
$newmenu->add("/accountancy/admin/account.php?mainmenu=home", $langs->trans("Chartofaccounts"),1);
$newmenu->add("/admin/fiscalyear.php?mainmenu=home", $langs->trans("Fiscalyear"),1); $newmenu->add("/admin/fiscalyear.php?mainmenu=home", $langs->trans("Fiscalyear"),1);
if (! in_array($langs->defaultlang,array('en_US','en_GB','en_NZ','en_AU','fr_FR','fr_BE','es_ES','ca_ES'))) if (! in_array($langs->defaultlang,array('en_US','en_GB','en_NZ','en_AU','fr_FR','fr_BE','es_ES','ca_ES')))
{ {
@ -515,6 +514,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1); $newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1); $newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"),1); $newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"),1);
if (! empty($conf->accounting->enabled)) $newmenu->add("/accountancy/admin/account.php?mainmenu=home", $langs->trans("Chartofaccounts"),1);
$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1); $newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
} }
@ -904,12 +904,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire); if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=ca", $langs->trans("ByProductsAndServices"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire); if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=ca", $langs->trans("ByProductsAndServices"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if (! empty($conf->comptabilite->enabled))
// Journaux {
//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire); // Journaux
//journaux //if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=ca",$langs->trans("SellsJournal"),1,$user->rights->compta->resultat->lire); //journaux
if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=ca",$langs->trans("PurchasesJournal"),1,$user->rights->compta->resultat->lire); if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=ca",$langs->trans("SellsJournal"),1,$user->rights->compta->resultat->lire);
if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=ca",$langs->trans("PurchasesJournal"),1,$user->rights->compta->resultat->lire);
}
} }
} }
@ -1252,8 +1254,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
else dol_print_error($db); else dol_print_error($db);
$db->free($resql); $db->free($resql);
} }
if (!empty($user->rights->banque->lire) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') // Entry for each bank journal
// Accountancy journals
if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy')
{ {
$newmenu->add('/accountancy/journal/index.php',$langs->trans("Journaux"),0,$user->rights->banque->lire);
$sql = "SELECT rowid, label, accountancy_journal"; $sql = "SELECT rowid, label, accountancy_journal";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
@ -1266,11 +1272,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$numr = $db->num_rows($resql); $numr = $db->num_rows($resql);
$i = 0; $i = 0;
if ($numr > 0) $newmenu->add('/accountancy/journal/index.php',$langs->trans("Journaux"),0,$user->rights->banque->lire); if ($numr > 0)
// Add other journal
$newmenu->add("/accountancy/journal/sellsjournal.php",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire);
$newmenu->add("/accountancy/journal/purchasesjournal.php",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire);
while ($i < $numr) while ($i < $numr)
{ {
@ -1281,7 +1283,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
} }
else dol_print_error($db); else dol_print_error($db);
$db->free($resql); $db->free($resql);
// Add other journal
$newmenu->add("/accountancy/journal/sellsjournal.php",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire);
$newmenu->add("/accountancy/journal/purchasesjournal.php",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire);
} }
if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP
{ {
$MAXFTP=20; $MAXFTP=20;