diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 14c4bce3126..043021df367 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -717,7 +717,7 @@ class AccountancyCategory // extends CommonObject
/**
* Function to show result of an accounting account from the ledger with a direction and a period
*
- * @param int $cpt Id accounting account
+ * @param int[array $cpt Accounting account or array of accounting account
* @param string $date_start Date start
* @param string $date_end Date end
* @param int $sens Sens of the account: 0: credit - debit, 1: debit - credit
@@ -734,10 +734,24 @@ class AccountancyCategory // extends CommonObject
$this->sdcpermonth = array();
$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
+ if (is_array($cpt)) $sql.=", t.numero_compte as accountancy_account";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
//if (in_array($this->db->type, array('mysql', 'mysqli'))) $sql.=' USE INDEX idx_accounting_bookkeeping_doc_date';
$sql .= " WHERE t.entity = ".$conf->entity;
- $sql .= " AND t.numero_compte = '" . $this->db->escape($cpt) . "'";
+ if (is_array($cpt))
+ {
+ $listofaccount='';
+ foreach($cpt as $cptcursor)
+ {
+ if ($listofaccount) $listofaccount.=",";
+ $listofaccount.="'".$cptcursor."'";
+ }
+ $sql .= " AND t.numero_compte IN (" .$listofaccount. ")";
+ }
+ else
+ {
+ $sql .= " AND t.numero_compte = '" . $this->db->escape($cpt) . "'";
+ }
if (! empty($date_start) && ! empty($date_end) && (empty($month) || empty($year))) // If month/year provided, it is stronger than filter date_start/date_end
$sql .= " AND (t.doc_date BETWEEN '".$this->db->idate($date_start)."' AND '".$this->db->idate($date_end)."')";
if (! empty($month) && ! empty($year)) {
@@ -747,6 +761,7 @@ class AccountancyCategory // extends CommonObject
{
$sql .= " AND t.thirdparty_code = '".$this->db->escape($thirdparty_code)."'";
}
+ if (is_array($cpt)) $sql.=" GROUP BY t.numero_compte";
//print $sql;
$resql = $this->db->query($sql);
@@ -761,11 +776,15 @@ class AccountancyCategory // extends CommonObject
} else {
$this->sdc = $obj->credit - $obj->debit;
}
- $this->sdcpermonth[$year.'_'.$month.'_'.$sens] = $this->sdc;
+ if (is_array($cpt))
+ {
+ $this->sdcperaccount[$obj->accountancy_account] = $this->sdc;
+ }
}
return $num;
} else {
$this->error = "Error " . $this->db->lasterror();
+ $this->errors[] = $this->error;
dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
return -1;
}
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index d5d0bffc2e3..fcb329dd730 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -382,6 +382,8 @@ elseif ($modecompta=="BOOKKEEPING")
}
else // normal category
{
+ $code = $cat['code']; // Category code we process
+
$totCat = array();
$totCat['NP'] = 0;
$totCat['N'] = 0;
@@ -394,6 +396,70 @@ elseif ($modecompta=="BOOKKEEPING")
// Set $cpts with array of accounts in the category/group
$cpts = $AccCat->getCptsCat($cat['rowid']);
+ $arrayofaccountforfilter=array();
+ foreach($cpts as $i => $cpt) // Loop on each account.
+ {
+ $arrayofaccountforfilter[]=$cpt['account_number'];
+ }
+
+ // N-1
+ if (! empty($arrayofaccountforfilter))
+ {
+ $return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cpt['dc']?$cpt['dc']:0);
+ var_dump($AccCat->sdcperaccount);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ $resultNP=0;
+ } else {
+ foreach($cpts as $i => $cpt) // Loop on each account.
+ {
+ $resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']])?0:$AccCat->sdcperaccount[$cpt['account_number']];
+
+ $totCat['NP'] += $resultNP;
+ $sommes[$code]['NP'] += $resultNP;
+ $totPerAccount[$cpt['account_number']]['NP'] = $resultNP;
+ }
+ }
+ }
+
+ // Set value into column N-1, N and each month M ($totCat)
+ // This make 14 calls for each detail of account (N-1, N and 12 monthes m)
+ foreach($cpts as $i => $cpt) // Loop on each account.
+ {
+ // We make 1 loop for each account because we may want detail per account.
+ // @TODO Optimize to ask a 'group by' account and a filter with account in (..., ...) in request
+
+ // Each month
+ $resultN = 0;
+ foreach($months as $k => $v)
+ {
+ $monthtoprocess = $k+1; // ($k+1) is month 1, 2, ..., 12
+ $yeartoprocess = $start_year;
+ if (($k+1) < $start_month) $yeartoprocess++;
+
+ //var_dump($monthtoprocess.'_'.$yeartoprocess);
+ $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cpt['dc']?$cpt['dc']:0, 'nofilter', $monthtoprocess, $yeartoprocess);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ $resultM=0;
+ } else {
+ $resultM=$AccCat->sdc;
+ }
+ $totCat['M'][$k] += $resultM;
+ $sommes[$code]['M'][$k] += $resultM;
+ $totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
+
+ $resultN += $resultM;
+ }
+
+ $totCat['N'] += $resultN;
+ $sommes[$code]['N'] += $resultN;
+ $totPerAccount[$cpt['account_number']]['N'] = $resultN;
+ }
+
+
+ // Now output columns for row $code ('VTE', 'MAR', ...)
+
print "";
// Column group
@@ -427,66 +493,6 @@ elseif ($modecompta=="BOOKKEEPING")
}
print '';
- $code = $cat['code'];
-
- // Set value into column N-1, N and each month M ($totCat)
- // This make 14 calls for each detail of account (N-1, N and 12 monthes m)
- foreach($cpts as $i => $cpt) // Loop on each account.
- {
- // We make 1 loop for each account because we may want detail.
- // @TODO Optimize mode when $showaccountdetail == 'no'
-
- // N-1
- $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start_previous, $date_end_previous, $cpt['dc']?$cpt['dc']:0);
- if ($return < 0) {
- setEventMessages(null, $AccCat->errors, 'errors');
- $resultNP=0;
- } else {
- $resultNP=$AccCat->sdc;
- }
-
- $totCat['NP'] += $resultNP;
- $sommes[$code]['NP'] += $resultNP;
- $totPerAccount[$cpt['account_number']]['NP'] = $resultNP;
-
- // Each month
- $resultN = 0;
- foreach($months as $k => $v)
- {
- $monthtoprocess = $k+1; // ($k+1) is month 1, 2, ..., 12
- $yeartoprocess = $start_year;
- if (($k+1) < $start_month) $yeartoprocess++;
-
- //var_dump($monthtoprocess.'_'.$yeartoprocess);
- $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cpt['dc']?$cpt['dc']:0, 'nofilter', $monthtoprocess, $yeartoprocess);
- if ($return < 0) {
- setEventMessages(null, $AccCat->errors, 'errors');
- $resultM=0;
- } else {
- $resultM=$AccCat->sdc;
- }
- $totCat['M'][$k] += $resultM;
- $sommes[$code]['M'][$k] += $resultM;
- $totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
-
- $resultN += $resultM;
- }
-
- // N
- /*$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cpt['dc']);
- if ($return < 0) {
- setEventMessages(null, $AccCat->errors, 'errors');
- $resultN=0;
- } else {
- $resultN=$AccCat->sdc;
- }*/
-
- $totCat['N'] += $resultN;
- $sommes[$code]['N'] += $resultN;
- $totPerAccount[$cpt['account_number']]['N'] = $resultN;
- }
-
- // Now output columns for row $code ('VTE', 'MAR', ...)
print '| ' . price($totCat['NP']) . ' | ';
print '' . price($totCat['N']) . ' | ';
@@ -500,7 +506,7 @@ elseif ($modecompta=="BOOKKEEPING")
print "
\n";
- // Loop on detail of all accounts
+ // Loop on detail of all accounts to output the detail
if ($showaccountdetail != 'no')
{
foreach($cpts as $i => $cpt)
@@ -537,7 +543,6 @@ elseif ($modecompta=="BOOKKEEPING")
print '' . price($resultM) . ' | ';
}
}
-
print "\n";
}
}