From ea3e851ec05b101817ff0c9d1a11c51bbe491864 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 29 Jun 2016 16:54:37 +0200
Subject: [PATCH] Fix stuff in accoutancy
---
htdocs/accountancy/admin/categories.php | 127 ++++---
.../class/accountancycategory.class.php | 354 +++++++++---------
htdocs/accountancy/report/result.php | 73 ++--
htdocs/core/modules/modAccounting.class.php | 10 +-
4 files changed, 295 insertions(+), 269 deletions(-)
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index b1836836e84..e1a0e3fe052 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -16,9 +16,9 @@
*/
/**
- * \file htdocs/accountancy/admin/categories.php
- * \ingroup Advanced accountancy
- * \brief Page to assign mass categories to accounts
+ * \file htdocs/accountancy/admin/categories.php
+ * \ingroup Advanced accountancy
+ * \brief Page to assign mass categories to accounts
*/
require '../../main.inc.php';
@@ -36,11 +36,11 @@ $langs->load("accountancy");
$mesg = '';
$action = GETPOST('action');
$cat_id = GETPOST('account_category');
-$selectcpt = GETPOST('cpt_bk');
+$selectcpt = GETPOST('cpt_bk', 'array');
$cpt_id = GETPOST('cptid');
-if($cat_id == 0){
- $cat_id = null;
+if ($cat_id == 0) {
+ $cat_id = null;
}
$id = GETPOST('id', 'int');
@@ -54,31 +54,30 @@ if (! $user->admin)
$AccCat = new AccountancyCategory($db);
// si ajout de comptes
-if(!empty($selectcpt)){
- $cpts = array();
- $i = 0;
- foreach ($selectcpt as $selectedOption){
- $cpts[$i] = "'".$selectedOption."'";
- $i++;
+if (! empty($selectcpt)) {
+ $cpts = array ();
+ foreach ( $selectcpt as $selectedOption ) {
+ if (! array_key_exists($selectedOption, $cpts))
+ $cpts[$selectedOption] = "'" . $selectedOption . "'";
}
-
- if($AccCat->updateAccAcc($cat_id, $cpts)){
+
+ $return= $AccCat->updateAccAcc($cat_id, $cpts);
+
+ if ($return<0) {
+ setEventMessages($langs->trans('errors'), $AccCat->errors, 'errors');
+ } else {
setEventMessages($langs->trans('Saved'), null, 'mesgs');
- }else{
- setEventMessages($langs->trans('errors'), null, 'errors');
}
-
-
}
if ($action == 'delete') {
- if($cpt_id){
- if($AccCat->deleteCptCat($cpt_id)){
+ if ($cpt_id) {
+ if ($AccCat->deleteCptCat($cpt_id)) {
setEventMessages($langs->trans('Deleted'), null, 'mesgs');
- }else{
+ } else {
setEventMessages($langs->trans('errors'), null, 'errors');
}
}
-}
+}
/*
* View
@@ -88,65 +87,69 @@ llxheader('', $langs->trans('AccountAccounting'));
$formaccounting = new FormAccounting($db);
$form = new Form($db);
- print load_fiche_titre($langs->trans('Categories'));
+print load_fiche_titre($langs->trans('Categories'));
- print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
- print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
- print '<input type="hidden" name="action" value="display">';
+print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="action" value="display">';
- dol_fiche_head();
-
- print '<table class="border" width="100%">';
- // Category
- print '<tr><td>' . $langs->trans("AccountingCategory") . '</td>';
- print '<td>';
- $formaccounting->select_accounting_category($cat_id, 'account_category', 1);
- print '<input class="button" type="submit" value="' . $langs->trans("Display") . '">';
- print '</td></tr>';
+dol_fiche_head();
+print '<table class="border" width="100%">';
+// Category
+print '<tr><td>' . $langs->trans("AccountingCategory") . '</td>';
+print '<td>';
+$formaccounting->select_accounting_category($cat_id, 'account_category', 1);
+print '<input class="button" type="submit" value="' . $langs->trans("Display") . '">';
+print '</td></tr>';
- if(!empty($cat_id)){
- $obj = $AccCat->getCptBK($cat_id);
- print '<tr><td>' . $langs->trans("AddCompteFromBK") . '</td>';
- print '<td>';
- if(!empty($obj)){
- print '<select size="'.count($obj).'" name="cpt_bk[]" multiple>';
- foreach ( $obj as $cpt ) {
- print '<option value="'.length_accountg($cpt->numero_compte).'">' . length_accountg($cpt->numero_compte) . ' ('.$cpt->label_compte.' '.$cpt->doc_ref.')</option>';
-
- }
- print '</select> - <input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("add") . '"> ';
+if (! empty($cat_id)) {
+ $return = $AccCat->getCptBK($cat_id);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ }
+ print '<tr><td>' . $langs->trans("AddCompteFromBK") . '</td>';
+ print '<td>';
+ if (is_array($AccCat->lines_cptbk) && count($AccCat->lines_cptbk) > 0) {
+ print '<select size="' . count($obj) . '" name="cpt_bk[]" multiple>';
+ foreach ( $AccCat->lines_cptbk as $cpt ) {
+ print '<option value="' . length_accountg($cpt->numero_compte) . '">' . length_accountg($cpt->numero_compte) . ' (' . $cpt->label_compte . ' ' . $cpt->doc_ref . ')</option>';
}
- print '</td></tr>';
+ print '</select> - <input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("add") . '"> ';
}
-
- print '</table>';
+ print '</td></tr>';
+}
- dol_fiche_end();
+print '</table>';
- print '</form>';
+dol_fiche_end();
+
+print '</form>';
if ($action == 'display' || $action == 'delete') {
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Numerocompte").'</th><th class="liste_titre">'.$langs->trans("Description").'</th><th class="liste_titre" width="60" align="center">Action</th></tr>';
+ print '<tr class="liste_titre"><th class="liste_titre">' . $langs->trans("Numerocompte") . '</th><th class="liste_titre">' . $langs->trans("Description") . '</th><th class="liste_titre" width="60" align="center">Action</th></tr>';
- if(!empty($cat_id)){
- $obj = $AccCat->display($cat_id);
- $j=1;
- if(!empty($obj)){
- foreach ( $obj as $cpt ) {
+ if (! empty($cat_id)) {
+ $return = $AccCat->display($cat_id);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ }
+ $j = 1;
+ if (is_array($AccCat->lines_display) && count($AccCat->lines_display) > 0) {
+ foreach ( $AccCat->lines_display as $cpt ) {
$var = ! $var;
- print '<tr'. $bc[$var].'>';
+ print '<tr' . $bc[$var] . '>';
print '<td>' . length_accountg($cpt->account_number) . '</td>';
print '<td>' . $cpt->label . '</td>';
- print $form->formconfirm($_SERVER["PHP_SELF"]."?account_category=$cat_id&cptid=".$cpt->rowid, $langs->trans("DeleteCptCategory"), $langs->trans("ConfirmDeleteCptCategory"), "delete", '', 0, "action-delete".$j);
- print '<td><input class="button" type="button" id="action-delete'.$j.'" value="' . $langs->trans("Delete") . '"></td>';
+ print $form->formconfirm($_SERVER["PHP_SELF"] . "?account_category=$cat_id&cptid=" . $cpt->rowid, $langs->trans("DeleteCptCategory"), $langs->trans("ConfirmDeleteCptCategory"), "delete", '', 0, "action-delete" . $j);
+ print '<td><input class="button" type="button" id="action-delete' . $j . '" value="' . $langs->trans("Delete") . '"></td>';
print "</tr>\n";
- $j++;
+ $j ++;
}
- }
+ }
}
print "</table>";
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index ef880aa8113..43b9816c5ed 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -17,9 +17,9 @@
*/
/**
- * \file htdocs/accountancy/class/accountancycategory.class.php
- * \ingroup Advanced accountancy
- * \brief File of class to manage categories of an accounting category_type
+ * \file htdocs/accountancy/class/accountancycategory.class.php
+ * \ingroup Advanced accountancy
+ * \brief File of class to manage categories of an accounting category_type
*/
// Class
@@ -32,18 +32,20 @@ class AccountancyCategory
{
private $db;
public $error;
- public $errors = array();
- //public $element='accounting_category';
- //public $table_element='c_accounting_category';
+ public $errors = array ();
+ public $element = 'accounting_category';
+ public $table_element = 'c_accounting_category';
public $id;
+ public $lines_cptbk;
+ public $lines_display;
+ public $sdc;
/**
- * Constructor
+ * Constructor
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $db Database handler
*/
- public function __construct($db)
- {
+ public function __construct($db) {
$this->db = $db;
return 1;
@@ -52,122 +54,136 @@ class AccountancyCategory
/**
* Function to select all accounting accounts from an accounting category
*
- * @param int $id Id
+ * @param int $id Id
*
* @return int <0 if KO, 0 if not found, >0 if OK
- */
- public function display($id)
- {
+ */
+ public function display($id) {
$sql = "SELECT t.rowid, t.account_number, t.label";
- $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
- $sql.= " WHERE t.fk_accounting_category = " . $id;
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
+ $sql .= " WHERE t.fk_accounting_category = " . $id;
+
+ $this->lines_display = array ();
dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
- $i = 0;
- $obj = '';
$num = $this->db->num_rows($resql);
if ($num) {
- while ( $i < $num ) {
- $obj[$i] = $this->db->fetch_object($resql);
- $i ++;
+ while ( $obj = $this->db->fetch_object($resql) ) {
+ $this->lines_display[] = $obj;
}
}
- return $obj;
+ return $num;
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+ $this->errors[] = $this->error;
+ dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
- return -1;
+ return - 1;
}
}
/**
* Function to select accountiing category of an accounting account present in chart of accounts
*
- * @param int $id Id category
+ * @param int $id Id category
*
* @return int <0 if KO, 0 if not found, >0 if OK
*/
- public function getCptBK($id)
- {
+ public function getCptBK($id) {
global $conf;
$sql = "SELECT t.numero_compte, t.label_compte, t.doc_ref";
- $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
- $sql.= " WHERE t.numero_compte NOT IN (";
- $sql.= " SELECT t.account_number";
- $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
- $sql.= " WHERE t.fk_accounting_category = " . $id .")";
- $sql.= " AND t.numero_compte IN (";
- $sql.= " SELECT DISTINCT aa.account_number";
- $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
- $sql.= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
- $sql.= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
- $sql.= " AND aa.active = 1)";
- $sql.= " GROUP BY t.numero_compte";
-
- dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
+ $sql .= " WHERE t.numero_compte NOT IN (";
+ $sql .= " SELECT t.account_number";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
+ $sql .= " WHERE t.fk_accounting_category = " . $id . ")";
+ $sql .= " AND t.numero_compte IN (";
+ $sql .= " SELECT DISTINCT aa.account_number";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+ $sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+ $sql .= " AND aa.active = 1)";
+ $sql .= " GROUP BY t.numero_compte, t.label_compte, t.doc_ref";
+ $sql .= " ORDER BY t.numero_compte";
+
+ $this->lines_CptBk = array ();
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
- $i = 0;
- $obj = '';
$num = $this->db->num_rows($resql);
if ($num) {
- while ( $i < $num ) {
- $obj[$i] = $this->db->fetch_object($resql);
- $i ++;
+ while ( $obj = $this->db->fetch_object($resql) ) {
+ $this->lines_cptbk[] = $obj;
}
}
- return $obj;
+ return $num;
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+ $this->errors[] = $this->error;
+ dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
- return -1;
+ return - 1;
}
}
-
+
/**
* Function to add an accounting account in an accounting category
*
- * @param int $id_cat Id category
- * @param array $cpts list of accounts array
+ * @param int $id_cat Id category
+ * @param array $cpts list of accounts array
*
* @return int <0 if KO, >0 if OK
*/
- public function updateAccAcc($id_cat, $cpts = array())
- {
+ public function updateAccAcc($id_cat, $cpts = array()) {
global $conf;
$error = 0;
- $sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account as aa";
- $sql.= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
- $sql.= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
- $sql.= " AND aa.active = 1";
- $sql.= " SET fk_accounting_category=" . $id_cat;
- $sql.= " WHERE aa.account_number IN (" . join(',',$cpts) .")";
- $this->db->begin();
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
- dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+ $sql = "SELECT aa.rowid,aa.account_number ";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+ $sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+ $sql .= " AND aa.active = 1";
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
$this->errors[] = "Error " . $this->db->lasterror();
+ return -1;
+ }
+
+ $this->db->begin();
+ while ( $obj = $this->db->fetch_object($resql)) {
+ if (array_key_exists(length_accountg($obj->account_number), $cpts)) {
+ $sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account";
+ $sql .= " SET fk_accounting_category=" . $id_cat;
+ $sql .= " WHERE rowid=".$obj->rowid;
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if (! $resql) {
+ $error ++;
+ $this->errors[] = "Error " . $this->db->lasterror();
+ }
+ }
}
// Commit or rollback
if ($error) {
- foreach ($this->errors as $errmsg) {
+ foreach ( $this->errors as $errmsg ) {
dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
- $this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+ $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
}
$this->db->rollback();
- return -1 * $error;
+ return - 1 * $error;
} else {
$this->db->commit();
@@ -178,17 +194,16 @@ class AccountancyCategory
/**
* Function to delete an accounting account from an accounting category
*
- * @param int $cpt_id Id of accounting account
+ * @param int $cpt_id Id of accounting account
*
* @return int <0 if KO, >0 if OK
*/
- public function deleteCptCat($cpt_id)
- {
+ public function deleteCptCat($cpt_id) {
$error = 0;
$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account as aa";
- $sql.= " SET fk_accounting_category= 0";
- $sql.= " WHERE aa.rowid= " . $cpt_id;
+ $sql .= " SET fk_accounting_category= 0";
+ $sql .= " WHERE aa.rowid= " . $cpt_id;
$this->db->begin();
dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
@@ -200,13 +215,13 @@ class AccountancyCategory
// Commit or rollback
if ($error) {
- foreach ($this->errors as $errmsg) {
+ foreach ( $this->errors as $errmsg ) {
dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
- $this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+ $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
}
$this->db->rollback();
- return -1 * $error;
+ return - 1 * $error;
} else {
$this->db->commit();
@@ -217,57 +232,51 @@ class AccountancyCategory
/**
* Function to know all category from accounting account
*
- * @return array Result in table
+ * @return array Result in table
*/
- public function getCatsCpts()
- {
+ public function getCatsCpts() {
global $mysoc;
$sql = "";
- if (empty($mysoc->country_id) && empty($mysoc->country_code))
- {
- dol_print_error('','Call to select_accounting_account with mysoc country not yet defined');
- exit;
- }
-
- if (! empty($mysoc->country_id))
- {
- $sql = "SELECT t.rowid, t.account_number, t.label as name_cpt, cat.code, cat.position, cat.label as name_cat, cat.sens ";
- $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_account as t, ".MAIN_DB_PREFIX."c_accounting_category as cat";
- $sql.= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
- $sql.= " WHERE c.active = 1";
- $sql.= " AND c.fk_country = ".$mysoc->country_id.")";
- $sql.= " AND cat.rowid = t.fk_accounting_category";
- $sql.= " ORDER BY cat.position ASC";
- }
- else
- {
- $sql = "SELECT c.rowid, c.code, c.label, c.category_type ";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
- $sql.= " WHERE c.active = 1 AND c.fk_country = co.rowid";
- $sql.= " AND co.code = '".$mysoc->country_code."'";
- $sql.= " ORDER BY c.position ASC";
- }
-
- $resql = $this->db->query($sql);
+ if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
+ dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+ exit();
+ }
+
+ if (! empty($mysoc->country_id)) {
+ $sql = "SELECT t.rowid, t.account_number, t.label as name_cpt, cat.code, cat.position, cat.label as name_cat, cat.sens ";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t, " . MAIN_DB_PREFIX . "c_accounting_category as cat";
+ $sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+ $sql .= " WHERE c.active = 1";
+ $sql .= " AND c.fk_country = " . $mysoc->country_id . ")";
+ $sql .= " AND cat.rowid = t.fk_accounting_category";
+ $sql .= " ORDER BY cat.position ASC";
+ } else {
+ $sql = "SELECT c.rowid, c.code, c.label, c.category_type ";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c, " . MAIN_DB_PREFIX . "c_country as co";
+ $sql .= " WHERE c.active = 1 AND c.fk_country = co.rowid";
+ $sql .= " AND co.code = '" . $mysoc->country_code . "'";
+ $sql .= " ORDER BY c.position ASC";
+ }
+
+ $resql = $this->db->query($sql);
if ($resql) {
$i = 0;
$obj = '';
$num = $this->db->num_rows($resql);
- $data = array();
+ $data = array ();
if ($num) {
- while ( $i < $num ) {
- $obj = $this->db->fetch_object($resql);
+ while ( $obj = $this->db->fetch_object($resql) ) {
$name_cat = $obj->name_cat;
- $data[$name_cat][$i] = array(
- 'id' => $obj->rowid,
- 'code' => $obj->code,
- 'position' => $obj->position,
- 'account_number' => $obj->account_number,
- 'name_cpt' => $obj->name_cpt,
- 'sens' => $obj->sens,
- );
+ $data[$name_cat][$i] = array (
+ 'id' => $obj->rowid,
+ 'code' => $obj->code,
+ 'position' => $obj->position,
+ 'account_number' => $obj->account_number,
+ 'name_cpt' => $obj->name_cpt,
+ 'sens' => $obj->sens
+ );
$i ++;
}
}
@@ -276,29 +285,28 @@ class AccountancyCategory
$this->error = "Error " . $this->db->lasterror();
dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
- return -1;
+ return - 1;
}
- }
+ }
/**
* Function to show result of an accounting account from the general ledger with a sens and a period
- *
- * @param int $cpt Id accounting account
- * @param string $month Specifig month - Can be empty
- * @param string $year Specific year
- * @param int $sens Sens of the account 0: credit - debit 1: debit - credit
*
- * @return array Result in table
+ * @param int $cpt Id accounting account
+ * @param string $month Specifig month - Can be empty
+ * @param string $year Specific year
+ * @param int $sens Sens of the account 0: credit - debit 1: debit - credit
+ *
+ * @return array Result in table
*/
- public function getResult($cpt, $month, $year, $sens)
- {
- $sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
- $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
- $sql.= " WHERE t.numero_compte = " . $cpt;
- $sql.= " AND YEAR(t.doc_date) = " . $year;
-
- if(! empty($month)){
- $sql.= " AND MONTH(t.doc_date) = " . $month;
+ public function getResult($cpt, $month, $year, $sens) {
+ $sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
+ $sql .= " WHERE t.numero_compte = '" . $cpt."'";
+ $sql .= " AND YEAR(t.doc_date) = " . $year;
+
+ if (! empty($month)) {
+ $sql .= " AND MONTH(t.doc_date) = " . $month;
}
dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
@@ -306,81 +314,77 @@ class AccountancyCategory
if ($resql) {
$num = $this->db->num_rows($resql);
- $sdc = 0;
+ $this->sdc = 0;
if ($num) {
$obj = $this->db->fetch_object($resql);
- if($sens == 1){
- $sdc = $obj->debit - $obj->credit;
- }else{
- $sdc = $obj->credit - $obj->debit;
+ if ($sens == 1) {
+ $this->sdc = $obj->debit - $obj->credit;
+ } else {
+ $this->sdc = $obj->credit - $obj->debit;
}
}
- return $sdc;
+ return $num;
} else {
$this->error = "Error " . $this->db->lasterror();
dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
- return -1;
+ return - 1;
}
}
/**
* Function to call category from a specific country
*
- * @return array Result in table
+ * @return array Result in table
*/
- public function getCatsCal()
- {
- global $db,$langs,$user,$mysoc;
-
- if (empty($mysoc->country_id) && empty($mysoc->country_code))
- {
- dol_print_error('','Call to select_accounting_account with mysoc country not yet defined');
- exit;
- }
-
- if (! empty($mysoc->country_id))
- {
- $sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
- $sql.= " WHERE c.active = 1 AND c.category_type = 1 ";
- $sql.= " AND c.fk_country = ".$mysoc->country_id;
- $sql.= " ORDER BY c.position ASC";
- }
- else
- {
- $sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
- $sql.= " WHERE c.active = 1 AND c.category_type = 1 AND c.fk_country = co.rowid";
- $sql.= " AND co.code = '".$mysoc->country_code."'";
- $sql.= " ORDER BY c.position ASC";
- }
-
- dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+ public function getCatsCal() {
+ global $db, $langs, $user, $mysoc;
+
+ if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
+ dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+ exit();
+ }
+
+ if (! empty($mysoc->country_id)) {
+ $sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+ $sql .= " WHERE c.active = 1 AND c.category_type = 1 ";
+ $sql .= " AND c.fk_country = " . $mysoc->country_id;
+ $sql .= " ORDER BY c.position ASC";
+ } else {
+ $sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c, " . MAIN_DB_PREFIX . "c_country as co";
+ $sql .= " WHERE c.active = 1 AND c.category_type = 1 AND c.fk_country = co.rowid";
+ $sql .= " AND co.code = '" . $mysoc->country_code . "'";
+ $sql .= " ORDER BY c.position ASC";
+ }
+
+ dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
$i = 0;
$obj = '';
$num = $this->db->num_rows($resql);
- $data = array();
+ $data = array ();
if ($num) {
while ( $i < $num ) {
$obj = $this->db->fetch_object($resql);
$position = $obj->position;
- $data[$position] = array(
- 'code' => $obj->code,
- 'label' => $obj->label,
- 'formula' => $obj->formula
- );
+ $data[$position] = array (
+ 'code' => $obj->code,
+ 'label' => $obj->label,
+ 'formula' => $obj->formula
+ );
$i ++;
}
}
return $data;
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+ $this->errors[] = $this->error;
+ dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
- return -1;
+ return - 1;
}
}
}
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index 72a4d6e96b2..c9c1a13fd14 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -53,7 +53,7 @@ if ($year == 0) {
}
if($cat_id == 0){
- $cat_id = null;
+ $cat_id = null;
}
// Security check
@@ -76,31 +76,31 @@ $textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current -
$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
print load_fiche_titre($langs->trans('ReportInOut') . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
-
+
print '<table class="border" width="100%">';
-
-$months = array( $langs->trans("JanuaryMin"),
- $langs->trans("FebruaryMin"),
- $langs->trans("MarchMin"),
- $langs->trans("AprilMin"),
- $langs->trans("MayMin"),
- $langs->trans("JuneMin"),
- $langs->trans("JulyMin"),
- $langs->trans("AugustMin"),
- $langs->trans("SeptemberMin"),
- $langs->trans("OctoberMin"),
- $langs->trans("NovemberMin"),
+
+$months = array( $langs->trans("JanuaryMin"),
+ $langs->trans("FebruaryMin"),
+ $langs->trans("MarchMin"),
+ $langs->trans("AprilMin"),
+ $langs->trans("MayMin"),
+ $langs->trans("JuneMin"),
+ $langs->trans("JulyMin"),
+ $langs->trans("AugustMin"),
+ $langs->trans("SeptemberMin"),
+ $langs->trans("OctoberMin"),
+ $langs->trans("NovemberMin"),
$langs->trans("DecemberMin"),
);
print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Account").'</th>';
print '<th class="liste_titre">'.$langs->trans("Description").'</th>';
-print '<th class="liste_titre" align="center">N-1</th>';
+print '<th class="liste_titre" align="center">N-1</th>';
print '<th class="liste_titre" align="center">'.$langs->trans("NReal").'</th>';
foreach($months as $k => $v){
print '<th class="liste_titre" align="center">'.$langs->trans($v).'</th>';
}
-print '</tr>';
+print '</tr>';
$cats = $AccCat->getCatsCpts();
$catsCalcule = $AccCat->getCatsCal();
@@ -123,22 +123,41 @@ if(!empty($cats))
$position = $cpt['position'];
$code = $cpt['code'];
- $resultNP = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
- $resultN = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
+ $return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ $resultNP=0;
+ } else {
+ $resultNP=$AccCat->sdc;
+ }
+
+ $return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ $resultN=0;
+ } else {
+ $resultN=$AccCat->sdc;
+ }
$sommes[$code]['NP'] += $resultNP;
- $sommes[$code]['N'] += $resultN;
+ $sommes[$code]['N'] += $resultN;
print '<tr'. $bc[$var].'>';
print '<td>' . $cpt['account_number'] . '</td>';
print '<td>' . $cpt['name_cpt'] . '</td>';
print '<td>' . price($resultNP) . '</td>';
print '<td>' . price($resultN) . '</td>';
-
+
foreach($months as $k => $v){
- $resultM = $AccCat->getResult($cpt['account_number'], $k+1, $year_current, $cpt['dc']);
+ $return = $AccCat->getResult($cpt['account_number'], $k+1, $year_current, $cpt['dc']);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ $resultM=0;
+ } else {
+ $resultM=$AccCat->sdc;
+ }
$sommes[$code]['M'][$k] += $resultM;
print '<td align="right">' . price($resultM) . '</td>';
}
-
+
print "</tr>\n";
}
@@ -168,9 +187,9 @@ if(!empty($cats))
}
$result = strtr($formula, $vars);
eval( '$result = (' . $result . ');' );
- print '<td align="right">' . price($result) . '</td>';
+ print '<td align="right">' . price($result) . '</td>';
$sommes[$code]['N'] += $result;
-
+
// Detail by month
foreach($months as $k => $v){
foreach($sommes as $code => $det){
@@ -181,14 +200,14 @@ if(!empty($cats))
print '<td align="right">' . price($result) . '</td>';
$sommes[$code]['M'][$k] += $result;
}
-
+
//print '<td colspan="15">' . $catsCalcule[$p]['formula'] . '</td>';
print "</tr>\n";
unset($catsCalcule[$p]); // j'élimine la catégorie calculée après affichage
}
$j++;
}
-
+
// Others calculed category
foreach($catsCalcule as $p => $catc)
{
@@ -215,7 +234,7 @@ if(!empty($cats))
}
$result = strtr($formula, $vars);
eval( '$result = (' . $result . ');' );
- print '<td align="right">' . price($result) . '</td>';
+ print '<td align="right">' . price($result) . '</td>';
$sommes[$code]['N'] += $result;
// Detail by month
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 03b450aa275..af51e01c576 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -71,7 +71,7 @@ class modAccounting extends DolibarrModules
$this->requiredby = array(); // List of modules id to disable if this one is disabled
$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
$this->phpmin = array(5, 3); // Minimum version of PHP required by module
- $this->need_dolibarr_version = array(3, 7); // Minimum version of Dolibarr required by module
+ $this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
$this->langfiles = array("accountancy");
// Constants
@@ -179,7 +179,7 @@ class modAccounting extends DolibarrModules
$this->const[18] = array (
"ACCOUNTING_EXPORT_GLOBAL_ACCOUNT",
"yesno",
- "1"
+ "1"
);
$this->const[19] = array (
"ACCOUNTING_EXPORT_LABEL",
@@ -189,12 +189,12 @@ class modAccounting extends DolibarrModules
$this->const[20] = array (
"ACCOUNTING_EXPORT_AMOUNT",
"yesno",
- "1"
+ "1"
);
$this->const[21] = array (
"ACCOUNTING_EXPORT_DEVISE",
"yesno",
- "1"
+ "1"
);
*/
$this->const[22] = array(
@@ -270,7 +270,7 @@ class modAccounting extends DolibarrModules
$this->rights[$r][4] = 'fiscalyear';
$this->rights[$r][5] = '';
$r++;
-
+
$this->rights[$r][0] = 50440;
$this->rights[$r][1] = 'Manage chart of accounts';
$this->rights[$r][2] = 'r';
--
GitLab