diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index 789c40fcc6a..fd7b8eb42d2 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -19,25 +19,38 @@ * $Source$ * */ + +/** + \file htdocs/comm/bookmark.php + \brief Page affichage des bookmarks + \version $Revision$ +*/ + + require("./pre.inc.php"); + llxHeader(); -if ($sortorder == "") { - $sortorder="DESC"; -} -if ($sortfield == "") { - $sortfield="idp"; -} +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="idp"; + +if ($page == -1) { $page = 0 ; } +$limit = 26; +$offset = $limit * $page ; +$pageprev = $page - 1; +$pagenext = $page + 1; $yn["t"] = "oui"; $yn["f"] = "non"; $ynn["1"] = "oui"; $ynn["0"] = "non"; + + if ($action == 'add') { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, author) VALUES ($socidp, now(),'". $user->login ."');"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),'". $user->login ."');"; if (! $db->query($sql) ) { print $db->error(); @@ -46,46 +59,33 @@ if ($action == 'add') if ($action == 'delete') { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=$bid AND author = '". $user->login ."'"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=$bid AND fk_user = '". $user->login ."'"; $result = $db->query($sql); } -if ($page == -1) { $page = 0 ; } -$limit = 26; -$offset = $limit * $page ; -$pageprev = $page - 1; -$pagenext = $page + 1; -print '
| "; print " | Id | "; print "Societe | "; - print ''.$langs->trans("Status").' | '; print "".$langs->trans("Author")." | "; print "".$langs->trans("Date")." | "; @@ -97,25 +97,13 @@ if ( $db->query($sql) ) $obj = $db->fetch_object(); $var=!$var; - $bc1="bgcolor=\"#90c090\""; - $bc2="bgcolor=\"#b0e0b0\""; - if (!$var) - { - $bc=$bc1; - } - else - { - $bc=$bc2; - } - print "|||||
| " . ($i + 1 + ($limit * $page)) . " | "; print "$obj->idp | "; - print "idp\">$obj->nom | \n"; - - print "$obj->stcomm | \n"; - print "$obj->author | \n"; - print "".strftime("%d %b %Y %H:%M", $obj->dateb) ." | "; - print "[bid\">Delete] | \n"; + print "idp\">$obj->nom | \n"; + print "$obj->fk_user | \n"; + print "".dolibarr_print_date($obj->dateb) ." | "; + print "bid\">".img_delete()." | \n"; print "
| propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref." | "; - print "idp\">".img_object($langs->trans("ShowCompany"),"company")." ".$obj->nom." | \n"; + print "idp\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,40)." | \n"; print ""; print dolibarr_print_date($obj->dp)." | \n"; print "".price($obj->price)." | ||||||
| '; + print ' | '; print ''.img_object($langs->trans("ShowPropal"),"propal").' '; print $objp->ref.' | '; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.' | '; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,40).' | '; $now = time(); $lim = 3600 * 24 * 15 ; - if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) { print "> 15 jours | "; diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 1091f05b2ab..6864deff731 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -108,7 +108,7 @@ if ($_GET["action"] == 'create') print "