diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 29e56cd4233..961a012f396 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -77,7 +77,7 @@ $form = new Form($db); if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) { $sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear "; - $sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'"; + $sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'"; $sql .= $db->plimit(1); $res = $db->query($sql); if ($res->num_rows > 0) { @@ -237,7 +237,7 @@ if ($action != 'export_csv') print '
| '; + print ' | '; print $langs->trans('From'); print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, ''); print ' '; @@ -254,7 +254,7 @@ if ($action != 'export_csv') print ' | |||||||||||
| '.$langs->trans("SubTotal").': | '.price($sous_total_opening_balance).' | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_credit - $sous_total_debit)).' | '; + print '||||||||
| '.$langs->trans("SubTotal").': | '; + // print ''.price($sous_total_opening_balance).' | '; + print ''.price($sous_total_debit).' | '; + print ''.price($sous_total_credit).' | '; + print ''.price(price2num($sous_total_credit - $sous_total_debit)).' | '; print "\n"; print ' | |||||||
| '.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').' | '; + print ''.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').' | '; print ''.length_accountg($line->numero_compte).' | '; print ''.$description.' | '; - print ''.price($opening_balance).' | '; + // print ''.price($opening_balance).' | '; print ''.price($line->debit).' | '; print ''.price($line->credit).' | '; - print ''.price($opening_balance + $line->debit - $line->credit).' | '; + print ''.price(/*$opening_balance +*/ $line->debit - $line->credit).' | '; print ''.$link; print ' | '; print "\n"; @@ -333,14 +341,22 @@ if ($action != 'export_csv') // Records the sub-total $sous_total_debit += $line->debit; $sous_total_credit += $line->credit; - $sous_total_opening_balance += $opening_balance; + // $sous_total_opening_balance += $opening_balance; } - print '||
| '.$langs->trans("SubTotal").': | '.price($sous_total_opening_balance).' | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).' | '; + print '||||||||
| '.$langs->trans("SubTotal").': | '; + // print ''.price($sous_total_opening_balance).' | '; + print ''.price($sous_total_debit).' | '; + print ''.price($sous_total_credit).' | '; + print ''.price(price2num(/*$sous_total_opening_balance +*/ $sous_total_debit - $sous_total_credit, 'MT')).' | '; print "\n"; print ' | |||||||
| '.$langs->trans("AccountBalance").': | '.price($total_opening_balance).' | '.price($total_debit).' | '.price($total_credit).' | '.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).' | '; + print '||||||||
| '.$langs->trans("AccountBalance").': | '; + // print ''.price($total_opening_balance).' | '; + print ''.price($total_debit).' | '; + print ''.price($total_credit).' | '; + print ''.price(price2num(/*$total_opening_balance +*/ $total_debit - $total_credit, 'MT')).' | '; print "\n"; print ' | |||||||