diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 19f34d856ab..8edcd4bca04 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -338,7 +338,7 @@ class AccountancyCategory * @param string $month Specifig month - Can be empty * @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 + * @param int $sens Sens of the account: 0: credit - debit, 1: debit - credit * @return integer Result in table */ public function getResult($cpt, $month, $date_start, $date_end, $sens) diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 524f993ba3b..67a9f3aec61 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php' require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php'; $langs->loadLangs(array('compta','bills','donation','salaries')); @@ -119,11 +120,29 @@ $modecompta = $conf->global->ACCOUNTING_MODE; if (! empty($conf->accounting->enabled)) $modecompta='BOOKKEEPING'; if (GETPOST("modecompta",'alpha')) $modecompta=GETPOST("modecompta",'alpha'); +$AccCat = new AccountancyCategory($db); + + /* * View */ +$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"), +); + llxHeader(); $form=new Form($db); @@ -265,32 +284,14 @@ if ($modecompta == 'BOOKKEEPING') // Loop on detail of all accounts // This make 14 calls for each detail of account (NP, N and month m) if ($showaccountdetail == 'yes') - { /* + { + // TODO Get list of account for this group/subgroup + $cpts = array(); + foreach($cpts as $i => $cpt) { - // N-1 - $return = $AccCat->getResult($cpt['account_number'], 0, $date_start_previous, $date_end_previous, $cpt['dc']); - - if ($return < 0) { - setEventMessages(null, $AccCat->errors, 'errors'); - $resultNP=0; - } else { - $resultNP=$AccCat->sdc; - } - - //N - $return = $AccCat->getResult($cpt['account_number'], 0, $date_start, $date_end, $cpt['dc']); - if ($return < 0) { - setEventMessages(null, $AccCat->errors, 'errors'); - $resultN=0; - } else { - $resultN=$AccCat->sdc; - } - - $sommes[$code]['NP'] += $resultNP; - $sommes[$code]['N'] += $resultN; - print ''; + print '     ' . length_accountg($cpt['account_number']) . ''; print '' . $cpt['name_cpt'] . ''; print '' . price($resultNP) . ''; @@ -306,14 +307,11 @@ if ($modecompta == 'BOOKKEEPING') $resultM=$AccCat->sdc; } $sommes[$code]['M'][$k] += $resultM; - if ($showaccountdetail == 'yes') { - print '' . price($resultM) . ''; - } + print '' . price($resultM) . ''; } print "\n"; } - */ } $i++; diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php index fb78c6b8485..31d56074148 100644 --- a/htdocs/compta/resultat/result.php +++ b/htdocs/compta/resultat/result.php @@ -26,8 +26,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php'; $langs->loadLangs(array('compta','bills','donation','salaries')); @@ -136,6 +136,21 @@ $AccCat = new AccountancyCategory($db); * View */ +$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"), +); + llxheader('', $langs->trans('ReportInOut')); $formaccounting = new FormAccounting($db); @@ -205,20 +220,6 @@ $moreforfilter=''; print '
'; print ''."\n"; -$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 ''; print ''; print '';
'.$langs->trans("AccountingCategory").'