lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look fixes and enhancements

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-20 19:03:31 +00:00
parent 089dfce6a7
commit 40704a5c5a
16 changed files with 89 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/deb/README
View File

@ -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

2
build/rpm/README
View File

@ -39,4 +39,4 @@ is my first package to maintain myself. So i'm seeking a sponsor.
- Edit field "Block" and add FE-NEEDSPONSOR
- Check bug is into database by searching with id on https://bugzilla.redhat.com/

10
htdocs/categories/index.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
@ -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 '<table class="nobordernopadding" width="100%">';
print '<table class="liste" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td colspan="3">'.$langs->trans("Description").'</td></tr>';
@ -264,7 +264,7 @@ foreach($fulltree as $key => $val)
$categstatic->ref=$val['label'];
$categstatic->type=$type;
print ' &nbsp;'.$categstatic->getNomUrl(0,'',28);
//print ' &nbsp;'.dol_trunc($val['label'],28);
//if ($section == $val['id']) print '</u>';
print '</td>';
@ -313,5 +313,5 @@ print "</table>";
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $');
?>

6
htdocs/comm/action/listactions.php
View File

@ -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 '<br>';
$i = 0;
print "<table class=\"noborder\" width=\"100%\">";
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
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 $');
?>

8
htdocs/compta/bank/index.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copytight (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
* 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 '<table class="nobordernopadding" width="100%">';
print '<table class="liste" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CurrentAccounts").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("AccountIdShort").'</td>';
@ -245,5 +245,5 @@ print "</div>";
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.54 $');
?>

21
htdocs/compta/bank/rappro.php
View File

@ -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='<a href="releve.php?account='.$_GET["account"].'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
$liste='<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$_GET["account"].'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
}
if ($numr >= $nbmax) $liste="... &nbsp; ".$liste;
print $liste;
if ($numr > 0) print '<br><br>';
else print $langs->trans("None").'<br><br>';
else print '<b>'.$langs->trans("None").'</b><br><br>';
}
else
{
dol_print_error($db);
}
print '<table class="border" width="100%">';
print '<table class="liste" width="100%">';
print "<tr class=\"liste_titre\">\n";
print '<td align="center">'.$langs->trans("DateOperationShort").'</td>';
print '<td align="center">'.$langs->trans("DateValueShort").'</td>';
@ -402,5 +403,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.66 $');
?>

9
htdocs/compta/paiement/cheque/fiche.php
View File

@ -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").'<br>';
print $langs->trans("SelectChequeTransactionAndGenerate").'<br><br>'."\n";
print '<form class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="action" value="new">';
//print '<fieldset><legend>aaa</legend>';
@ -354,7 +355,7 @@ if ($action == 'new')
if ($i == 0)
{
print $langs->trans("NoWaitingChecks").'<br>';
print '<b>'.$langs->trans("NoWaitingChecks").'</b><br>';
}
}
@ -619,5 +620,5 @@ if ($action != 'new')
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/20 19:03:35 $ - $Revision: 1.77 $');
?>

8
htdocs/compta/resultat/clientfourn.php
View File

@ -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 '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td width="10%">&nbsp;</td><td>'.$langs->trans("Element").'</td>';
print '<td width="10%">&nbsp;</td><td>&nbsp;</td>';
if ($modecompta == 'CREANCES-DETTES') print "<td align=\"right\">".$langs->trans("AmountHT")."</td>";
print "<td align=\"right\">".$langs->trans("AmountTTC")."</td>";
print "</tr>\n";
@ -678,7 +678,7 @@ if ($mysoc->tva_assuj != 'franchise') // Assujeti
print '</tr>';
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
if ($modecompta == 'CREANCES-DETTES') print '<td class="border" align="right">'.price($total_ht).'</td>';
if ($modecompta == 'CREANCES-DETTES') print '<td class="liste_total" align="right">'.price($total_ht).'</td>';
print '<td class="liste_total" align="right">'.price($total_ttc).'</td>';
print '</tr>';
}
@ -689,5 +689,5 @@ print '<br>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/20 19:03:33 $ - $Revision: 1.62 $');
?>

10
htdocs/compta/stats/index.php
View File

@ -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 '<table width="100%" class="noborder">';
print '<tr class="liste_titre"><td rowspan="2">'.$langs->trans("Month").'</td>';
print '<tr class="liste_titre"><td>&nbsp;</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
@ -184,7 +184,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print '</tr>';
print '<tr class="liste_titre">';
print '<tr class="liste_titre"><td>'.$langs->trans("Month").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
@ -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 "<tr $bc[$var]>";
print "<tr ".$bc[$var].">";
print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,2000),"%B")."</td>";
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@ -498,6 +498,6 @@ print "</table>";
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/20 19:03:32 $ - $Revision: 1.50 $');
?>

4
htdocs/core/class/html.formfile.class.php
View File

@ -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 '<table width="100%" class="nobordernopadding">';
print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').'">';
print '<tr class="liste_titre">';
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);

10
htdocs/exports/class/export.class.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
*
* 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);
}
}

4
htdocs/includes/boxes/modules_boxes.php
View File

@ -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 '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder">'."\n";
print '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
}
// Show box title

20
htdocs/theme/auguria/style.css.php
View File

@ -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;

8
htdocs/theme/eldy/style.css.php
View File

@ -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;

8
htdocs/theme/freelug/style.css.php
View File

@ -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;

8
htdocs/theme/yellow/style.css.php
View File

@ -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;