diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 094c7cdd1b3..7a9eb64cae2 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -80,7 +80,6 @@ if ($action == 'del' && $account && $user->rights->banque->modifier) llxHeader(); -//print "

Page: $page - Account: " . $_GET["account"] . " - " . $HTTP_POST_VARS["account"]."

\n"; if ($account > 0) { @@ -94,8 +93,6 @@ if ($account > 0) } $acct = new Account($db); $acct->fetch($account); - print_titre("Journal de trésorerie du compte : " .$acct->label); - print '
'; // Chargement des categories dans $options $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ;"; @@ -118,21 +115,21 @@ if ($account > 0) * * */ - if ($HTTP_POST_VARS["req_desc"]) + if ($_POST["req_desc"]) { - $sql_rech = " AND lower(b.label) like '%".strtolower($HTTP_POST_VARS["req_desc"])."%'"; + $sql_rech = " AND lower(b.label) like '%".strtolower($_POST["req_desc"])."%'"; $mode_search = 1; } else { $mode_search = 0; } + /* * * */ $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."bank as b WHERE 1=1"; -// $sql .= " AND b.dateo <= now()"; $sql .= " AND b.fk_account=".$acct->id; $sql .= $sql_rech; @@ -166,30 +163,34 @@ if ($account > 0) $page = 0; $limitsql = $nbline; } - //print "$page $viewline $nbline $limitsql"; /* * Formulaire de recherche * */ + $mesg=''; + $nbpage=round($total_lines/$viewline)+($total_lines % $viewline > 0?1:0); // Nombre de page total + if ($limitsql > $viewline) + { + $mesg.=''.img_previous().''; + } + $mesg.= ' Page '.($nbpage-$page).'/'.$nbpage.' '; + if ($total_lines > $limitsql ) + { + $mesg.= ''.img_next().''; + } + print_fiche_titre("Journal de trésorerie du compte : " .$acct->label,$mesg); + print '
'; + print '
'; print ''; print ''; print ''; print ""; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; print '
'; - if ($limitsql > $viewline) - { - print 'Page précédente'; - } - if ($total_lines > $limitsql ) - { - print 'Page suivante'; - } - print ' '; if ($user->rights->banque->modifier) diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index 49105b360d0..252e5292fc8 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -44,6 +44,7 @@ function valeur($sql) print_titre("Bilan"); +print '
'; print ''; print ""; diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index aa70c04e55d..aadf34322ef 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -38,6 +38,7 @@ if ($_GET["bid"] == 0) * Liste */ print_titre("Budgets"); + print '
'; print '
'; print ""; diff --git a/htdocs/compta/bank/config.php b/htdocs/compta/bank/config.php index adaede6f4d4..1216c8fd886 100644 --- a/htdocs/compta/bank/config.php +++ b/htdocs/compta/bank/config.php @@ -30,6 +30,7 @@ if (!$user->admin && !$user->rights->compta->bank) llxHeader(); print_titre("Configuration"); +print '
'; print '
'; print ""; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 2935c1ce1b6..c63a62d1e27 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -29,29 +29,29 @@ if (!$user->admin && !$user->rights->compta->bank) llxHeader(); -if ($HTTP_POST_VARS["action"] == 'add') +if ($_POST["action"] == 'add') { $account = new Account($db,0); - $account->bank = $HTTP_POST_VARS["bank"]; - $account->label = $HTTP_POST_VARS["label"]; + $account->bank = $_POST["bank"]; + $account->label = $_POST["label"]; - $account->courant = $HTTP_POST_VARS["courant"]; - $account->clos = $HTTP_POST_VARS["clos"]; + $account->courant = $_POST["courant"]; + $account->clos = $_POST["clos"]; - $account->code_banque = $HTTP_POST_VARS["code_banque"]; - $account->code_guichet = $HTTP_POST_VARS["code_guichet"]; - $account->number = $HTTP_POST_VARS["number"]; - $account->cle_rib = $HTTP_POST_VARS["cle_rib"]; - $account->bic = $HTTP_POST_VARS["bic"]; - $account->iban_prefix = $HTTP_POST_VARS["iban_prefix"]; - $account->domiciliation = $HTTP_POST_VARS["domiciliation"]; + $account->code_banque = $_POST["code_banque"]; + $account->code_guichet = $_POST["code_guichet"]; + $account->number = $_POST["number"]; + $account->cle_rib = $_POST["cle_rib"]; + $account->bic = $_POST["bic"]; + $account->iban_prefix = $_POST["iban_prefix"]; + $account->domiciliation = $_POST["domiciliation"]; - $account->proprio = $HTTP_POST_VARS["proprio"]; - $account->adresse_proprio = $HTTP_POST_VARS["adresse_proprio"]; + $account->proprio = $_POST["proprio"]; + $account->adresse_proprio = $_POST["adresse_proprio"]; - $account->solde = $HTTP_POST_VARS["solde"]; - $account->date_solde = mktime(12,0,0,$HTTP_POST_VARS["remonth"],$HTTP_POST_VARS["reday"],$HTTP_POST_VARS["reyear"]); + $account->solde = $_POST["solde"]; + $account->date_solde = mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]); $id = $account->create($user->id); } @@ -61,22 +61,22 @@ if ($action == 'update') $account = new Account($db, $id); $account->fetch($id); - $account->bank = $HTTP_POST_VARS["bank"]; - $account->label = $HTTP_POST_VARS["label"]; + $account->bank = $_POST["bank"]; + $account->label = $_POST["label"]; - $account->courant = $HTTP_POST_VARS["courant"]; - $account->clos = $HTTP_POST_VARS["clos"]; + $account->courant = $_POST["courant"]; + $account->clos = $_POST["clos"]; - $account->code_banque = $HTTP_POST_VARS["code_banque"]; - $account->code_guichet = $HTTP_POST_VARS["code_guichet"]; - $account->number = $HTTP_POST_VARS["number"]; - $account->cle_rib = $HTTP_POST_VARS["cle_rib"]; - $account->bic = $HTTP_POST_VARS["bic"]; - $account->iban_prefix = $HTTP_POST_VARS["iban_prefix"]; - $account->domiciliation = $HTTP_POST_VARS["domiciliation"]; + $account->code_banque = $_POST["code_banque"]; + $account->code_guichet = $_POST["code_guichet"]; + $account->number = $_POST["number"]; + $account->cle_rib = $_POST["cle_rib"]; + $account->bic = $_POST["bic"]; + $account->iban_prefix = $_POST["iban_prefix"]; + $account->domiciliation = $_POST["domiciliation"]; - $account->proprio = $HTTP_POST_VARS["proprio"]; - $account->adresse_proprio = $HTTP_POST_VARS["adresse_proprio"]; + $account->proprio = $_POST["proprio"]; + $account->adresse_proprio = $_POST["adresse_proprio"]; $account->update($id, $user); } @@ -158,9 +158,18 @@ else $account = new Account($db, $id); $account->fetch($id); - print '
Compte bancaire

'; + /* + * Affichage onglets + */ + $h = 0; + + $head[$h][0] = DOL_URL_ROOT."$PHP_SELF"; + $head[$h][1] = "Compte bancaire $account->number"; + $h++; - print '
'; + dolibarr_fiche_head($head, $hselected); + + print '
'; print ''; print ''; @@ -204,23 +213,22 @@ else print "\n"; print '
Banque'.$account->bank.'
'; + print '
'; - print '
'; + print ''; + + /* + * Barre d'actions + * + */ + print '
'; if ($user->admin) { - print '
'; - } - else - { - print ''; + print 'Editer'; } - print ''; - print ''; - print ''; - - print '
[Editer]----

'; + print ''; } diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 95acc994c28..71b1295e594 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -31,6 +31,7 @@ if (!$user->rights->banque->lire) llxHeader(); print_titre ("Comptes bancaires"); +print '
'; $sql = "SELECT rowid, label,number,bank FROM ".MAIN_DB_PREFIX."bank_account"; diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 76fbef9fbad..ebf6a2a835b 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -101,6 +101,7 @@ $acct = new Account($db); $acct->fetch($account); print_titre('Rapprochement bancaire compte : '.$acct->label.''); +print '
'; $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE rappro=0 AND fk_account=$account"; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 5facd023c4e..18fefbe11e5 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -50,11 +50,12 @@ llxHeader(); $acct = new Account($db); $acct->fetch($_GET["account"]); + if (! isset($_GET["num"])) { /* * - * Vue liste + * Vue liste tous relevés confondus * * */ @@ -78,7 +79,8 @@ if (! isset($_GET["num"])) $i = 0; print_barre_liste("Relevés bancaires, compte : id."\">".$acct->label."", $page, $PHP_SELF,"&account=$account",$sortfield,$sortorder,'',$numrows); - + print '
'; + print ''; print ""; print ""; @@ -102,11 +104,12 @@ if (! isset($_GET["num"])) else { /* - * Vue d'un releves + * Vue d'un releve * */ - if ($rel == 'prev') + if ($_GET["rel"] == 'prev') { + // Recherche valeur pour num = numéro relevé précédent $sql = "SELECT distinct(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < ".$_GET["num"]." AND fk_account = $account ORDER BY num_releve DESC"; $result = $db->query($sql); if ($result) @@ -121,8 +124,9 @@ else } } } - elseif ($rel == 'next') + elseif ($_GET["rel"] == 'next') { + // Recherche valeur pour num = numéro relevé précédent $sql = "SELECT distinct(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve > ".$_GET["num"]." AND fk_account = $account ORDER BY num_releve ASC"; $result = $db->query($sql); if ($result) @@ -137,26 +141,30 @@ else } } } + else { + // On veut le relevé num + $num=$_GET["num"]; + } - print_titre('Relevé numéro '.$_GET["num"].', compte : '.$acct->label.''); + $mesprevnext ="id\">".img_previous().""; + $mesprevnext.=" Relevé $num "; + $mesprevnext.="id\">".img_next().""; + print_fiche_titre('Relevé numéro '.$num.', compte : '.$acct->label.'',$mesprevnext); - print "
Relevé
"; - print ""; - print "
 id\"><- Relevé précédent"; - print "  -  id\">Relevé suivant ->
"; + print ""; print ""; print ''; - print ""; - print ''; - print ''; - print ''; - print ''; + print ""; + print ''; + print ''; + print ''; + print ''; print ''; - print "\n"; + print "\n"; - $sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < ".$_GET["num"]." AND fk_account = ".$acct->id; + $sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < $num AND fk_account = ".$acct->id; if ( $db->query($sql) ) { $total = $db->result (0, 0); @@ -166,8 +174,8 @@ else $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE"; - $sql .= " num_releve='".$_GET["num"]."'"; - if (! $_GET["num"]) { + $sql .= " num_releve='".$num."'"; + if (! $num) { $sql .= " or num_releve is null"; } $sql .= " AND fk_account = ".$acct->id; @@ -178,7 +186,7 @@ else $var=True; $numrows = $db->num_rows(); $i = 0; - print ""; + print ""; print "\n"; while ($i < $numrows) @@ -189,14 +197,14 @@ else $var=!$var; print ""; - print '\n"; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 57e39752a33..419472b6b07 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -55,6 +55,7 @@ if ($action == 'add') } print_titre("Virement"); +print '
'; print "";
Date OpeValeurTypeDescriptionDebitCreditSolde
Date OpeValeurTypeDescriptionDebitCreditSolde 
id."\">Vue etendue
id."\">Vue etendue ".price($total)." 
'.strftime("%d %b %Y",$objp->do).''; + print ''.dolibarr_print_date($objp->do).''; /* Mise ŕ jour de la date de valeur */ - print ''; + print ''; print img_previous() . " "; print strftime("%d/%m/%Y",$objp->dv) ." "; - print ''; + print ''; print img_next(); print "