From 248717ccac84439c51246324ba517cc43765fecd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 15 Jul 2017 13:31:14 +0200 Subject: [PATCH] Fix refresh of list when change were done --- htdocs/accountancy/journal/bankjournal.php | 30 ++++++++++++++----- .../journal/expensereportsjournal.php | 24 ++++++++++++--- .../accountancy/journal/purchasesjournal.php | 17 +++++++++++ htdocs/accountancy/journal/sellsjournal.php | 16 ++++++++++ 4 files changed, 76 insertions(+), 11 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index ee91f78374a..c71a7b5cd59 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -57,13 +57,13 @@ $langs->loadLangs(array("companies","other","compta","banks",'bills','donations' // Multi journal $id_journal = GETPOST('id_journal', 'int'); -$date_startmonth = GETPOST('date_startmonth'); -$date_startday = GETPOST('date_startday'); -$date_startyear = GETPOST('date_startyear'); -$date_endmonth = GETPOST('date_endmonth'); -$date_endday = GETPOST('date_endday'); -$date_endyear = GETPOST('date_endyear'); -$in_bookkeeping = GETPOST('in_bookkeeping'); +$date_startmonth = GETPOST('date_startmonth','int'); +$date_startday = GETPOST('date_startday','int'); +$date_startyear = GETPOST('date_startyear','int'); +$date_endmonth = GETPOST('date_endmonth','int'); +$date_endday = GETPOST('date_endday','int'); +$date_endyear = GETPOST('date_endyear','int'); +$in_bookkeeping = GETPOST('in_bookkeeping','aZ09'); if ($in_bookkeeping == '') $in_bookkeeping = 'notyet'; $now = dol_now(); @@ -645,6 +645,22 @@ if (! $error && $action == 'writebookkeeping') { } $action = ''; + + // Must reload data, so we make a redirect + if (count($tabpay) != $error) + { + $param=''; + $param='id_journal='.$id_journal; + $param.='&date_startday='.$date_startday; + $param.='&date_startmonth='.$date_startmonth; + $param.='&date_startyear='.$date_startyear; + $param.='&date_endday='.$date_endday; + $param.='&date_endmonth='.$date_endmonth; + $param.='&date_endyear='.$date_endyear; + $param.='&in_bookeeping='.$in_bookeeping; + header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:'')); + exit; + } } // Export diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index fb1e77d1c5c..4c25d64bc45 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -121,7 +121,7 @@ if ($result) { $tabuser = array (); $num = $db->num_rows($result); - + // Variables $account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'; $account_vat = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined'; @@ -138,7 +138,7 @@ if ($result) { $compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat); $compta_localtax1 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva); $compta_localtax2 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva); - + // Define array to display all VAT rates that use this accounting account $compta_tva if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code)) { @@ -149,14 +149,14 @@ if ($result) { $taber[$obj->rowid]["ref"] = $obj->ref; $taber[$obj->rowid]["comments"] = $obj->comments; $taber[$obj->rowid]["fk_expensereportdet"] = $obj->erdid; - + // Avoid warnings if (! isset($tabttc[$obj->rowid][$compta_user])) $tabttc[$obj->rowid][$compta_user] = 0; if (! isset($tabht[$obj->rowid][$compta_fees])) $tabht[$obj->rowid][$compta_fees] = 0; if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0; if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0; if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0; - + $tabttc[$obj->rowid][$compta_user] += $obj->total_ttc; $tabht[$obj->rowid][$compta_fees] += $obj->total_ht; $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva; @@ -356,6 +356,22 @@ if ($action == 'writebookkeeping') { } $action=''; + + // Must reload data, so we make a redirect + if (count($tabpay) != $error) + { + $param=''; + $param='id_journal='.$id_journal; + $param.='&date_startday='.$date_startday; + $param.='&date_startmonth='.$date_startmonth; + $param.='&date_startyear='.$date_startyear; + $param.='&date_endday='.$date_endday; + $param.='&date_endmonth='.$date_endmonth; + $param.='&date_endyear='.$date_endyear; + $param.='&in_bookeeping='.$in_bookeeping; + header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:'')); + exit; + } } /* diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 849e90d530e..488a6abf362 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -387,7 +387,24 @@ if ($action == 'writebookkeeping') { { setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings'); } + $action=''; + + // Must reload data, so we make a redirect + if (count($tabpay) != $error) + { + $param=''; + $param='id_journal='.$id_journal; + $param.='&date_startday='.$date_startday; + $param.='&date_startmonth='.$date_startmonth; + $param.='&date_startyear='.$date_startyear; + $param.='&date_endday='.$date_endday; + $param.='&date_endmonth='.$date_endmonth; + $param.='&date_endyear='.$date_endyear; + $param.='&in_bookeeping='.$in_bookeeping; + header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:'')); + exit; + } } /* diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index c1f6a3ca5bb..4185f9fbf5d 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -408,6 +408,22 @@ if ($action == 'writebookkeeping') { } $action=''; + + // Must reload data, so we make a redirect + if (count($tabpay) != $error) + { + $param=''; + $param='id_journal='.$id_journal; + $param.='&date_startday='.$date_startday; + $param.='&date_startmonth='.$date_startmonth; + $param.='&date_startyear='.$date_startyear; + $param.='&date_endday='.$date_endday; + $param.='&date_endmonth='.$date_endmonth; + $param.='&date_endyear='.$date_endyear; + $param.='&in_bookeeping='.$in_bookeeping; + header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:'')); + exit; + } }