diff --git a/build/deb/README b/build/deb/README index bac1945b426..6b15ee07cba 100644 --- a/build/deb/README +++ b/build/deb/README @@ -30,6 +30,8 @@ See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests conten - Wait until you received bug number. For first ITP submission of Dolibarr, bug id was 634783. + +- Check bug is into database by searching with id on http://www.debian.org/Bugs/ - Add a line for upstream into file changelog with bug number diff --git a/build/rpm/README b/build/rpm/README index 1e947a16435..11439542df7 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -39,4 +39,4 @@ is my first package to maintain myself. So i'm seeking a sponsor. - Edit field "Block" and add FE-NEEDSPONSOR - \ No newline at end of file +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 8e84125d65d..3500c6dd5c2 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2006-2010 Laurent Destailleur + * Copyright (C) 2006-2011 Laurent Destailleur * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2005-2009 Regis Houssin * @@ -24,7 +24,7 @@ * \file htdocs/categories/index.php * \ingroup category * \brief Home page of category area - * \version $Id$ + * \version $Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $ */ require("../main.inc.php"); @@ -129,7 +129,7 @@ $fulltree=$cate_arbo; -print ''; +print '
'; print ''; @@ -264,7 +264,7 @@ foreach($fulltree as $key => $val) $categstatic->ref=$val['label']; $categstatic->type=$type; print '  '.$categstatic->getNomUrl(0,'',28); - + //print '  '.dol_trunc($val['label'],28); //if ($section == $val['id']) print ''; print ''; @@ -313,5 +313,5 @@ print "
'.$langs->trans("Categories").''.$langs->trans("Description").'
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $'); ?> diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index f744315e7f6..5b1799411f9 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -23,7 +23,7 @@ * \file htdocs/comm/action/listactions.php * \ingroup agenda * \brief Page to list actions - * \version $Id$ + * \version $Id: listactions.php,v 1.55 2011/07/20 19:03:34 eldy Exp $ */ require("../../main.inc.php"); @@ -213,7 +213,7 @@ if ($resql) //print '
'; $i = 0; - print ""; + print '
'; print ''; print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield,$sortorder); //print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); @@ -348,5 +348,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.55 $'); ?> diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 1a97e3ea099..3c68da86c6b 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * Copytight (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -22,7 +22,7 @@ * \file htdocs/compta/bank/index.php * \ingroup banque * \brief Page accueil banque - * \version $Id$ + * \version $Id: index.php,v 1.54 2011/07/20 19:03:31 eldy Exp $ */ require("./pre.inc.php"); @@ -81,7 +81,7 @@ if ($resql) /* * Comptes courants (courant = 1) */ -print '
'; +print '
'; print ''; print ''; print ''; @@ -245,5 +245,5 @@ print ""; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.54 $'); ?> diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index f2a18ecf71a..81af311188e 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -22,7 +22,7 @@ * \file htdocs/compta/bank/rappro.php * \ingroup banque * \brief Page to reconciliate bank transactions - * \version $Id$ + * \version $Id: rappro.php,v 1.66 2011/07/20 19:03:31 eldy Exp $ */ require("./pre.inc.php"); @@ -151,10 +151,10 @@ if ($resql) // Show last bank receipts $nbmax=5; $liste=""; - $sql = "SELECT distinct num_releve FROM ".MAIN_DB_PREFIX."bank"; - $sql.= " WHERE fk_account=".$_GET["account"]; - $sql.= " ORDER BY num_releve DESC"; - $sql.= " LIMIT ".($nbmax+1); + $sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank"; + $sql.= " WHERE fk_account=".$_GET["account"]." AND num_releve IS NOT NULL"; + $sql.= $db->order("num_releve","DESC"); + $sql.= $db->plimit($nbmax+1); print $langs->trans("LastAccountStatements").' : '; $resqlr=$db->query($sql); if ($resqlr) @@ -162,23 +162,24 @@ if ($resql) $numr=$db->num_rows($resqlr); $i=0; while (($i < $numr) && ($i < $nbmax)) - { + {print $sql; $objr = $db->fetch_object($resqlr); $last_releve = $objr->num_releve; $i++; - $liste=''.$objr->num_releve.'   '.$liste; + $liste=''.$objr->num_releve.'   '.$liste; } if ($numr >= $nbmax) $liste="...   ".$liste; print $liste; + if ($numr > 0) print '

'; - else print $langs->trans("None").'

'; + else print ''.$langs->trans("None").'

'; } else { dol_print_error($db); } - print '
'.$langs->trans("CurrentAccounts").''.$langs->trans("Bank").''.$langs->trans("AccountIdShort").'
'; + print '
'; print "\n"; print ''; print ''; @@ -402,5 +403,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.66 $'); ?> diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 5194ba5cc61..8768393a460 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/compta/paiement/cheque/fiche.php * \ingroup bank, invoice * \brief Page for cheque deposits - * \version $Id$ + * \version $Id: fiche.php,v 1.77 2011/07/20 19:03:35 eldy Exp $ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu @@ -297,7 +297,8 @@ if ($action == 'new') $now=dol_now(); - print $langs->trans("SelectChequeTransactionAndGenerate").'
'; + print $langs->trans("SelectChequeTransactionAndGenerate").'

'."\n"; + print ''; print ''; //print '
aaa'; @@ -354,7 +355,7 @@ if ($action == 'new') if ($i == 0) { - print $langs->trans("NoWaitingChecks").'
'; + print ''.$langs->trans("NoWaitingChecks").'
'; } } @@ -619,5 +620,5 @@ if ($action != 'new') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index a2668c49c32..d9b46fd0165 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -21,7 +21,7 @@ /** * \file htdocs/compta/resultat/clientfourn.php * \brief Page reporting - * \version $Id$ + * \version $Id: clientfourn.php,v 1.62 2011/07/20 19:03:33 eldy Exp $ */ require('../../main.inc.php'); @@ -128,7 +128,7 @@ report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportl // Show report array print '
'.$langs->trans("DateOperationShort").''.$langs->trans("DateValueShort").'
'; print ''; -print ''; +print ''; if ($modecompta == 'CREANCES-DETTES') print ""; print ""; print "\n"; @@ -678,7 +678,7 @@ if ($mysoc->tva_assuj != 'franchise') // Assujeti print ''; print ''; - if ($modecompta == 'CREANCES-DETTES') print ''; + if ($modecompta == 'CREANCES-DETTES') print ''; print ''; print ''; } @@ -689,5 +689,5 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:33 $ - $Revision: 1.62 $'); ?> diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index a3d8515d5a1..f101a14a147 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -21,7 +21,7 @@ /** * \file htdocs/compta/stats/index.php * \brief Page reporting CA - * \version $Id$ + * \version $Id: index.php,v 1.50 2011/07/20 19:03:32 eldy Exp $ */ require('../../main.inc.php'); @@ -171,7 +171,7 @@ if ($modecompta != 'CREANCES-DETTES') { */ print '
 '.$langs->trans("Element").'  ".$langs->trans("AmountHT")."".$langs->trans("AmountTTC")."
'.$langs->trans("Profit").''.price($total_ht).''.price($total_ht).''.price($total_ttc).'
'; -print ''; +print ''; for ($annee = $year_start ; $annee <= $year_end ; $annee++) { @@ -184,7 +184,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) } print ''; -print ''; +print ''; for ($annee = $year_start ; $annee <= $year_end ; $annee++) { print ''; @@ -207,7 +207,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++) $mois_modulo = $mois;// ajout if($mois>12){$mois_modulo = $mois-12;} // ajout $var=!$var; - print ""; + print ""; print ""; for ($annee = $year_start ; $annee <= $year_end ; $annee++) @@ -498,6 +498,6 @@ print "
'.$langs->trans("Month").'
 
'.$langs->trans("Month").''.$langs->trans("AmountTTC").'
".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,2000),"%B")."
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/20 19:03:32 $ - $Revision: 1.50 $'); ?> diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index ab274743513..135dec1594f 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -22,7 +22,7 @@ * \file htdocs/core/class/html.formfile.class.php * \ingroup core * \brief File of class to offer components to list and upload files - * \version $Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $ + * \version $Id: html.formfile.class.php,v 1.50 2011/07/20 19:03:32 eldy Exp $ */ @@ -575,7 +575,7 @@ class FormFile if (empty($useinecm)) print_titre($langs->trans("AttachedFiles")); //else { $bc[true]=''; $bc[false]=''; }; $url=$_SERVER["PHP_SELF"]; - print ''; + print '
'; print ''; print_liste_field_titre($langs->trans("Documents2"),$_SERVER["PHP_SELF"],"name","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Size"),$_SERVER["PHP_SELF"],"size","",$param,'align="right"',$sortfield,$sortorder); diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 189a7dfce17..f487f9c7ac3 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2011 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -20,14 +20,14 @@ /** * \file htdocs/exports/class/export.class.php * \ingroup export - * \brief Fichier de la classe des exports - * \version $Id$ + * \brief File of class to manage exports + * \version $Id: export.class.php,v 1.11 2011/07/20 19:03:34 eldy Exp $ */ /** * \class Export - * \brief Classe permettant la gestion des exports + * \brief Class to manage exports */ class Export { @@ -174,8 +174,8 @@ class Export } } } + closedir($handle); } - closedir($handle); } } diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php index 549bd76f181..e13affbe9ec 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/includes/boxes/modules_boxes.php @@ -21,7 +21,7 @@ * \file htdocs/includes/boxes/modules_boxes.php * \ingroup facture * \brief Fichier contenant la classe mere des boites - * \version $Id$ + * \version $Id: modules_boxes.php,v 1.55 2011/07/20 19:03:35 eldy Exp $ */ @@ -115,7 +115,7 @@ class ModeleBoxes if (! empty($head['text']) || ! empty($head['sublink']) || $nblines) { - print '
'."\n"; + print '
'."\n"; } // Show box title diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 817e67b5516..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.87 2011/07/06 11:40:21 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1082,6 +1082,10 @@ margin-left: 1px; margin-right: 1px; margin-bottom: 2px; margin-top: 0px; + +-moz-box-shadow: 6px 6px 10px #CCC; +-webkit-box-shadow: 6px 6px 10px #CCC; +box-shadow: 6px 6px 10px #CCC; } table.noborder tr { @@ -1120,6 +1124,10 @@ width: 100%; border-collapse: collapse; border-top-color: #FEFEFE; +border-left-width: 1px; +border-left-color: #BBBBBB; +border-left-style: solid; + border-right-width: 1px; border-right-color: #BBBBBB; border-right-style: solid; @@ -1130,6 +1138,10 @@ border-bottom-style: solid; margin-bottom: 2px; margin-top: 0px; + +-moz-box-shadow: 6px 6px 10px #CCC; +-webkit-box-shadow: 6px 6px 10px #CCC; +box-shadow: 6px 6px 10px #CCC; } table.liste td { padding-right: 2px; @@ -1227,6 +1239,12 @@ border: 0px; * Boxes */ +.boxtable { +-moz-box-shadow: 6px 6px 10px #CCC; +-webkit-box-shadow: 6px 6px 10px #CCC; +box-shadow: 6px 6px 10px #CCC; +} + .box { padding-right: 0px; padding-left: 0px; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 17f5d84d3d5..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.85 2011/07/18 03:18:37 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1206,6 +1206,12 @@ border: 0px; * Boxes */ +.boxtable { +-moz-box-shadow: 8px 8px 20px #CCC; +-webkit-box-shadow: 8px 8px 20px #CCC; +box-shadow: 8px 8px 20px #CCC; +} + .box { padding-right: 0px; padding-left: 0px; diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index df2908253a1..34afdf52d09 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -20,7 +20,7 @@ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.41 2011/07/06 11:40:22 eldy Exp $ + * \version $Id: style.css.php,v 1.42 2011/07/20 19:03:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1047,6 +1047,12 @@ th { * Boxes */ +.boxtable { +-moz-box-shadow: 6px 6px 20px #AAA; +-webkit-box-shadow: 6px 6px 20px #AAA; +box-shadow: 6px 6px 20px #AAA; +} + .box { padding-right: 4px; padding-bottom: 4px; diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 4e2839ea923..dd5b38e06ef 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -20,7 +20,7 @@ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.43 2011/07/18 23:37:03 eldy Exp $ + * \version $Id: style.css.php,v 1.44 2011/07/20 19:03:32 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1039,6 +1039,12 @@ th { * Boxes */ +.boxtable { +-moz-box-shadow: 6px 6px 20px #AAA; +-webkit-box-shadow: 6px 6px 20px #AAA; +box-shadow: 6px 6px 20px #AAA; +} + .box { padding-right: 4px; padding-bottom: 4px;