diff --git a/doc/dev/config.sgml b/doc/dev/config.sgml new file mode 100644 index 00000000000..94aa157b8f1 --- /dev/null +++ b/doc/dev/config.sgml @@ -0,0 +1,58 @@ + + +Configuration + + Fichier de configuration + +

+ Le fichier de configuration de Dolibarr est + conf/conf.php il est écrit par /install.php +

+

+ Le contenu du fichier standard est : + + +$dolibarr_main_document_root="/spare/home/www/dolibarr/dolibarr/htdocs"; +$dolibarr_main_url_root="http://dolibarr.lafrere.lan"; +$dolibarr_main_db_host="localhost"; +$dolibarr_main_db_name="dolibarr"; +$dolibarr_main_db_user="dolibarr"; +$dolibarr_main_db_pass=""; + + +

+ + Paramètres optionnels supplémentaires +

+ Vous pouvez ajouter le paramètre supplémentaire optionnel : + +$dolibarr_auto_user="demo"; + + + Si vous souhaitez utiliser Dolibarr en mono-utilisateur, il + faut quand même que cet utilisateur existe dans la base de + données. +

+ + + + + + + diff --git a/doc/dev/dolibarr-dev.sgml b/doc/dev/dolibarr-dev.sgml index b29640f3b88..03bf26ecfb2 100644 --- a/doc/dev/dolibarr-dev.sgml +++ b/doc/dev/dolibarr-dev.sgml @@ -1,6 +1,7 @@ + @@ -25,6 +26,7 @@ &ch-main; &ch-modules; + &ch-config; &ch-permissions; &ch-constantes; &ch-propale; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index f77e72b07db..b05f03ee393 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -85,7 +85,6 @@ llxHeader(); if ($account) { - if ($vline) { $viewline = $vline; @@ -104,7 +103,7 @@ if ($account) */ print '
'; print ''; - print ''; + print '
'; print ""; print ''; print ''; @@ -112,7 +111,7 @@ if ($account) print ''; print ''; print ''; - print "\n"; + print "\n"; print ""; /* * @@ -120,13 +119,15 @@ if ($account) */ print ""; print ''; - print ""; + print ""; print ""; print ""; print ""; print ""; print ""; print "\n"; + + $limit = 20; $sql = "SELECT count(*) FROM llx_bank"; if ($account) { $sql .= " WHERE fk_account=$account"; } @@ -135,16 +136,20 @@ if ($account) $nbline = $db->result (0, 0); $db->free(); - if ($nbline > $viewline ) + if ($nbline > $limit ) { - $limit = $nbline - $viewline ; + $offset = $nbline - $limit; } else { - $limit = $viewline; + $offset = 0; } + + } - + + print ""; - print ""; - print ""; - print ''; - print ''; - print ''; - print '"; - print ""; - print ""; - print ""; - print ""; - print ''; - } + $sep = 1 ; + print ""; + print ""; + print ""; + print ''; + print ''; + print ''; + print '"; + print ""; + print ""; + print ""; + print ""; + print ''; + } - print ""; - print "\n"; - print "\n"; - - if ($objp->num_chq) - { - print ""; - } - else - { - //Xavier DUTOIT : Ajout d'un lien pour modifier la ligne - print ""; - -// print ""; - } - - if ($objp->amount < 0) - { - print "\n"; - } - else - { - print "\n"; - } - - if ($action !='search') - { - if ($total > 0) - { - print '\n"; - } - else - { - print "\n"; - } - } - else - { - print ''; - } - - if ($objp->rappro) - { - print ""; - } - else - { - print ""; - } - - print ""; + print ""; + print "\n"; + print "\n"; + + if ($objp->num_chq) + { + print ""; + } + else + { + print ""; + } + if ($objp->amount < 0) + { + print "\n"; + } + else + { + print "\n"; } - $i++; + if ($action !='search') + { + if ($total > 0) + { + print '\n"; + } + else + { + print "\n"; + } + } + else + { + print ''; + } + + if ($objp->rappro) + { + print ""; + } + else + { + print ""; + } + print ""; + + $i++; } $db->free(); }
   
DateTypeDescriptionDébitCréditSoldeRelevé
".$nbline; + $sql = "SELECT rowid, label FROM llx_bank_categ;"; $result = $db->query($sql); if ($result) @@ -167,6 +172,12 @@ if ($account) * select sum(amount) from solde ; */ + $pageprev = $page - 1; + $pagenext = $page + 1; + + $sql = "SELECT sum (b.amount) FROM llx_bank as b "; + + $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 llx_bank as b "; @@ -197,6 +208,7 @@ if ($account) } } $sql .= " ORDER BY b.dateo ASC"; + $sql .= $db->plimit($limit, $offset); $result = $db->query($sql); if ($result) @@ -212,92 +224,83 @@ if ($account) $objp = $db->fetch_object( $i); $total = $total + $objp->amount; $time = time(); - if ($i > ($nbline - $viewline)) + $var = !$var; + if ($objp->do > $time && !$sep) { - $var=!$var; - - if ($objp->do > $time && !$sep) - { - $sep = 1 ; - print "
 ".price($total - $objp->amount)." 
'; - print ''; - print ' -'; - print "
YYYYMMDD0000.00
 ".price($total - $objp->amount)." 
'; + print ''; + print ' -'; + print "
YYYYMMDD0000.00
".strftime("%d %b %y",$objp->do)."".$objp->fk_type."rowid&account=$account\">CHQ $objp->num_chq - $objp->labelrowid&account=$account\">$objp->label $objp->label ".price($objp->amount * -1)."  ".price($objp->amount)."'.price($total)."".price($total)."-num_releve&account=$account\">$objp->num_releverowid&account=$account\">[Del]
".strftime("%d %b %y",$objp->do)."".$objp->fk_type."rowid&account=$account\">CHQ $objp->num_chq - $objp->labelrowid&account=$account\">$objp->label ".price($objp->amount * -1)."  ".price($objp->amount)."'.price($total)."".price($total)."-num_releve&account=$account\">$objp->num_releverowid&account=$account\">[Del]