';
print '';
- print '| ';
+ print ' | ';
print $langs->trans('From');
print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
print ' ';
@@ -247,6 +244,7 @@ if ($action != 'export_csv')
print ' |
';
print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+ print_liste_field_titre("Opening Balance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -259,6 +257,16 @@ if ($action != 'export_csv')
$sous_total_credit = 0;
$displayed_account = "";
+ $sql = "select t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance from ".MAIN_DB_PREFIX."accounting_bookkeeping as t where entity in ".$conf->entity;
+ $sql.= " AND t.doc_date < '".$db->idate($search_date_start)."' GROUP BY t.numero_compte";
+ $resql = $db->query($sql);
+ $nrows = $resql->num_rows;
+ $opening_balances = Array();
+ for($i = 0; $i < $nrows; $i++) {
+ $arr = $resql->fetch_array();
+ $opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
+ }
+
foreach ($object->lines as $line)
{
$link = '';
@@ -283,7 +291,7 @@ if ($action != 'export_csv')
// Show first line of a break
print '
';
- print '| ' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . ' | ';
+ print '' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . ' | ';
print '
';
$displayed_account = $root_account_description;
@@ -295,6 +303,7 @@ if ($action != 'export_csv')
print ''.length_accountg($line->numero_compte).' | ';
print ''.$description.' | ';
+ print ''.price($opening_balances["'".$line->numero_compte."'"]).' | ';
print ''.price($line->debit).' | ';
print ''.price($line->credit).' | ';
print ''.price($line->debit - $line->credit).' | ';
@@ -307,11 +316,11 @@ if ($action != 'export_csv')
$sous_total_credit += $line->credit;
}
- print '| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_debit - $sous_total_credit)).' | ';
+ print '
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_debit - $sous_total_credit)).' | ';
print " | \n";
print '
';
- print '| '.$langs->trans("AccountBalance").': | '.price($total_debit).' | '.price($total_credit).' | '.price(price2num($total_debit - $total_credit)).' | ';
+ print '
| '.$langs->trans("AccountBalance").': | '.price($total_debit).' | '.price($total_credit).' | '.price(price2num($total_debit - $total_credit)).' | ';
print " | \n";
print '
';
diff --git a/htdocs/accountancy/bookkeeping/openingbalance.php b/htdocs/accountancy/bookkeeping/openingbalance.php
deleted file mode 100644
index eaef50cf51f..00000000000
--- a/htdocs/accountancy/bookkeeping/openingbalance.php
+++ /dev/null
@@ -1,336 +0,0 @@
-
- * Copyright (C) 2016 Florian Henry
- * Copyright (C) 2016-2019 Alexandre Spangaro
- * Copyright (C) 2018 Frédéric France
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * \file htdocs/accountancy/bookkeeping/balance.php
- * \ingroup Accountancy (Double entries)
- * \brief Balance of book keeping
- */
-
-require '../../main.inc.php';
-
-// Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
-
-$page = GETPOST("page", 'int');
-$sortorder = GETPOST("sortorder", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$action = GETPOST('action', 'aZ09');
-if (GETPOST("exportcsv", 'alpha')) $action = 'export_csv';
-
-// Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-//if (! $sortfield) $sortfield="p.date_fin";
-//if (! $sortorder) $sortorder="DESC";
-
-
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
-
-$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
-if ($search_accountancy_code_start == - 1) {
- $search_accountancy_code_start = '';
-}
-$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
-if ($search_accountancy_code_end == - 1) {
- $search_accountancy_code_end = '';
-}
-
-$object = new BookKeeping($db);
-
-$formaccounting = new FormAccounting($db);
-$formother = new FormOther($db);
-$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 .= $db->plimit(1);
- $res = $db->query($sql);
- if ($res->num_rows > 0) {
- $fiscalYear = $db->fetch_object($res);
- $search_date_start = strtotime($fiscalYear->date_start);
- $search_date_end = strtotime($fiscalYear->date_end);
- } else {
- $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
- $year_start = dol_print_date(dol_now(), '%Y');
- $year_end = $year_start + 1;
- $month_end = $month_start - 1;
- if ($month_end < 1)
- {
- $month_end = 12;
- $year_end--;
- }
- $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
- $search_date_end = dol_get_last_day($year_end, $month_end);
- }
-}
-if ($sortorder == "")
- $sortorder = "ASC";
-if ($sortfield == "")
- $sortfield = "t.numero_compte";
-
-
-$param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-
-$filter = array();
-if (!empty($search_date_start)) {
- $filter['t.doc_date>='] = $search_date_start;
- $param .= '&date_startmonth='.GETPOST('date_startmonth', 'int').'&date_startday='.GETPOST('date_startday', 'int').'&date_startyear='.GETPOST('date_startyear', 'int');
-}
-if (!empty($search_date_end)) {
- $filter['t.doc_date<='] = $search_date_end;
- $param .= '&date_endmonth='.GETPOST('date_endmonth', 'int').'&date_endday='.GETPOST('date_endday', 'int').'&date_endyear='.GETPOST('date_endyear', 'int');
-}
-if (!empty($search_accountancy_code_start)) {
- $filter['t.numero_compte>='] = $search_accountancy_code_start;
- $param .= '&search_accountancy_code_start='.$search_accountancy_code_start;
-}
-if (!empty($search_accountancy_code_end)) {
- $filter['t.numero_compte<='] = $search_accountancy_code_end;
- $param .= '&search_accountancy_code_end='.$search_accountancy_code_end;
-}
-
-/*
- * Action
- */
-
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
- $search_accountancy_code_start = '';
- $search_accountancy_code_end = '';
- $search_date_start = '';
- $search_date_end = '';
- $filter = array();
-}
-
-
-/*
- * View
- */
-
-if ($action == 'export_csv')
-{
- $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-
- $filename = 'balance';
- $type_export = 'balance';
- include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
-
- $result = $object->fetchAllBalance($sortorder, $sortfield, $limit, 0, $filter);
- if ($result < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- }
-
- foreach ($object->lines as $line)
- {
- print length_accountg($line->numero_compte).$sep;
- print $object->get_compte_desc($line->numero_compte).$sep;
- print price($line->debit).$sep;
- print price($line->credit).$sep;
- print price($line->debit - $line->credit).$sep;
- print "\n";
- }
-
- exit;
-}
-
-
-$title_page = $langs->trans("AccountBalance");
-
-llxHeader('', $title_page);
-
-
-if ($action != 'export_csv')
-{
- // List
- $nbtotalofrecords = '';
- if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
- {
- $nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
- if ($nbtotalofrecords < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
-
- $result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
- if ($result < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- }
-
- print '';
-}
-
-// End of page
-llxFooter();
-$db->close();