From 37da6efa694455192fb3d0a6dd886837ca0836f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 21 Jul 2011 01:20:31 +0000
Subject: [PATCH] Clean code to remove a lot of quality test errors
---
build/deb/control | 46 ++++----
build/deb/copyright | 38 ++++++-
build/deb/postinst | 12 +-
build/deb/postrm | 9 +-
build/deb/templates | 98 ----------------
build/deb/templates.futur | 105 ++++++++++++++++++
build/makepack-dolibarr.pl | 28 +++--
.../canvas/default/product.default.class.php | 3 +-
.../canvas/service/product.service.class.php | 3 +-
htdocs/theme/auguria/style.css.php | 6 +-
htdocs/theme/bureau2crea/style.css.php | 6 +-
htdocs/theme/cameleo/style.css.php | 6 +-
htdocs/theme/eldy/style.css.php | 6 +-
13 files changed, 200 insertions(+), 166 deletions(-)
create mode 100755 build/deb/templates.futur
diff --git a/build/deb/control b/build/deb/control
index 2d356fc7b2b..0a664bb7034 100644
--- a/build/deb/control
+++ b/build/deb/control
@@ -21,29 +21,29 @@ Description: Easy to use ERP & CRM software to manage your activity.
Only features you need are visible, depending on which module were activated.
Most common used modules are:
.
- * Customers, Suppliers or Prospects directory
- * Contacts directory
- * Orders management
- * Commercial proposals management
- * Invoices management
- * Products and services catalog
- * Stock management
- * Foundations members management
- * Bank accounts management
- * Point of Sale
- * Payments management
- * Commercial actions management
- * Contracts management
- * Standing orders management
- * Shipping management
- * Donations management
- * Bookmarks management
- * Mass Emailings
- * Reports
- * Data export and import tools
- * LDAP connectivity
- * PDF exports
- * And a lot of more modules...
+ Customers, Suppliers or Prospects directory
+ Contacts directory
+ Orders management
+ Commercial proposals management
+ Invoices management
+ Products and services catalog
+ Stock management
+ Foundations members management
+ Bank accounts management
+ Point of Sale
+ Payments management
+ Commercial actions management
+ Contracts management
+ Standing orders management
+ Shipping management
+ Donations management
+ Bookmarks management
+ Mass Emailings
+ Reports
+ Data export and import tools
+ LDAP connectivity
+ PDF exports
+ And a lot of more modules...
.
You can also add third parties external modules or develop yours.
\ No newline at end of file
diff --git a/build/deb/copyright b/build/deb/copyright
index 00aafd563b1..9d62fbbd285 100644
--- a/build/deb/copyright
+++ b/build/deb/copyright
@@ -1,4 +1,36 @@
-Copyright 2011 Laurent Destailleur <eldy@users.sourceforge.net>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Upstream-Name: Dolibarr
+Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
+Source: cvs.savannah.nongnu.org:/sources/dolibar
-This software is distributed under GPL v2 licence.
-See file /usr/share/common-licenses/GPL-2
\ No newline at end of file
+Files: *
+Copyright: 2002-2009, Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ 2003-2011, Laurent Destailleur <eldy@users.sourceforge.net>
+ 2004-2011, Regis Houssin <regis@dolibarr.fr>
+ 2003, Jean-Louis Bergamo <jlb@j1b.org>
+ 2004, Sebastien Di Cintio <sdicintio@ressource-toi.org>
+ 2004, Benoit Mortier <benoit.mortier@opensides.be>
+ 2004, Christophe Combelles <ccomb@free.fr>
+ 2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ 2010-2011, Juanjo Menent <jmenent@2byte.es>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
\ No newline at end of file
diff --git a/build/deb/postinst b/build/deb/postinst
index 80193b7d01b..03bd18987cd 100644
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -39,8 +39,8 @@ case "$1" in
superuserpassword=''
if [ -f /etc/mysql/debian.cnf ] ; then
# Load superuser login and pass
- superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
- superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+ superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | sed -e 's/^user[ =]*//g')
+ superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | sed -e 's/^password[ =]*//g')
fi
echo Mysql superuser found to use is $superuserlogin
if [ -z "$superuserlogin" ] ; then
@@ -115,10 +115,10 @@ case "$1" in
#target="/usr/share/applications/"
#cp -f $fileorig $target
# Not sure this is usefull
- if test -x /usr/bin/update-menus; then
- echo "update-menus"
- update-menus;
- fi
+ #if test -x /usr/bin/update-menus; then
+ # echo "update-menus"
+ # update-menus;
+ #fi
# TODO Create the file to force parameters in Web installer
#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
diff --git a/build/deb/postrm b/build/deb/postrm
index 78219066f9a..0ade4671858 100644
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -66,8 +66,8 @@ case "$1" in
superuserpassword=''
if [ -f /etc/mysql/debian.cnf ] ; then
# Load superuser login and pass
- superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
- superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+ superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | sed -e 's/^user[ =]*//g')
+ superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | sed -e 's/^password[ =]*//g')
fi
echo postrm Mysql superuser found to use is $superuserlogin
dbadmin="$superuserlogin"
@@ -208,7 +208,10 @@ case "$1" in
#fileorig="/usr/share/pixmaps/dolibarr.xpm"
#rm -f $fileorig
# Not sure this is usefull
- if test -x /usr/bin/update-menus; then update-menus; fi
+ #if test -x /usr/bin/update-menus; then
+ # echo "update-menus"
+ # update-menus;
+ #fi
;;
upgrade)
diff --git a/build/deb/templates b/build/deb/templates
index 1d1c133f99a..f7cceb2dbe5 100644
--- a/build/deb/templates
+++ b/build/deb/templates
@@ -1,92 +1,3 @@
-Template: dolibarr/configuration/note
-Type: note
-Description: Package configuration note
- Dolibarr can be and should be configured entirely via web, so, in the
- following configuration steps, I'm going to prompt you for the passwords that
- Dolibarr uses for web configuration and some default values for the
- application startup. Then you should point your browser to the Dolibarr
- setup, for example:
- .
- http://localhost/dolibarr/install.php
- .
- continue the configuration, fill the database and let Dolibarr be aware of
- the installed modules.
-
-Template: dolibarr/webserver
-Type: select
-Choices: Apache, Apache-ssl, Both, None
-Description: Which Web Server are you running ?
- Dolibarr supports any web server with PHP capabilities, but this
- configuration process only supports Apache and Apache-SSL.
-
-Template: dolibarr/db
-Type: text
-Description: Dolibarr DB setup note
- Now you should specify the DBMS settings. You must provide the host name on
- which the DBMS server is installed, the type (i.e. MySql), the DB name, the DBMS administrator user-name, etc.
-
-Template: dolibarr/db/host
-Type: string
-Default: localhost
-Description: Please, insert your database host name:
- This should be the host-name or IP address that dolibarr will use to access
- the DB.
-
-Template: dolibarr/db/port
-Type: string
-Default: 3306
-Description: Please, insert your database port:
- This should be the port value that Dolibarr will use to access
- the DB.
-
-Template: dolibarr/db/name
-Type: string
-Default: dolibarr
-Description: Please, insert Dolibarr database name:
- This is the name of the database that Dolibarr will use.
-
-Template: dolibarr/db/user/name
-Type: string
-Default: dolibarr
-Description: Please, insert the DBMS user-name to access the DB:
- This is the user-name that Dolibarr will use to access the DB.
-
-Template: dolibarr/db/user/password
-Type: password
-Description: Please, insert the password to access the DB:
- This is the password that Dolibarr will use, along with user-name you
- provided, to access the DB.
-
-Template: dolibarr/db/user/password/confirm
-Type: password
-Description: Please, retype the password to access the DB:
- Please insert the DB access password again. If the password you are going to
- retype mismatch the previous inserted one, I'll ask you to insert them again.
-
-Template: dolibarr/db/user/password/mismatch
-Type: text
-Description: Passwords mismatch
- The DB access passwords you inserted mismatch. Please, try again.
-
-Template: dolibarr/db/admin/name
-Type: string
-Default: root
-Description: Please, insert the DBMS administrator user-name:
- This user-name will be used to access the DBMS to create (if needed):
- .
- (1) The new Dolibarr database
- (2) The new database account that Dolibarr will use to access the DB
- .
- It should be 'root' for MySql.
-
-Template: dolibarr/db/admin/password
-Type: password
-Description: Please, insert the DBMS administrator password (if any):
- This is the password that will be used along with the DBMS administrator
- user-name.
- .
- NOTE: This password will not be asked twice, since it's not a new password.
-
Template: dolibarr/postrm
Type: boolean
Default: true
@@ -94,12 +5,3 @@ Description: Delete database ?
Delete the Dolibarr MySQL database and all its datas (datas related
to this quetion are the Dolibarr DBMS account and all
Dolibarr tables) ?
-
-Template: dolibarr/postrmfile
-Type: boolean
-Default: true
-Description: Delete attached files ?
- Delete also all uploaded and generated files (datas related
- to this quetion are all files found into /usr/share/dolibarr/documents,
- uploaded or generated when using Dolibarr) ?
-
\ No newline at end of file
diff --git a/build/deb/templates.futur b/build/deb/templates.futur
new file mode 100755
index 00000000000..a6fc2c94670
--- /dev/null
+++ b/build/deb/templates.futur
@@ -0,0 +1,105 @@
+#Template: dolibarr/configuration/note
+#Type: note
+#Description: Package configuration note
+# Dolibarr can be and should be configured entirely via web, so, in the
+# following configuration steps, I'm going to prompt you for the passwords that
+# Dolibarr uses for web configuration and some default values for the
+# application startup. Then you should point your browser to the Dolibarr
+# setup, for example:
+# .
+# http://localhost/dolibarr/install.php
+# .
+# continue the configuration, fill the database and let Dolibarr be aware of
+# the installed modules.
+
+#Template: dolibarr/webserver
+#Type: select
+#Choices: Apache, Apache-ssl, Both, None
+#Description: Which Web Server are you running ?
+# Dolibarr supports any web server with PHP capabilities, but this
+# configuration process only supports Apache and Apache-SSL.
+
+#Template: dolibarr/db
+#Type: text
+#Description: Dolibarr DB setup note
+# Now you should specify the DBMS settings. You must provide the host name on
+# which the DBMS server is installed, the type (i.e. MySql), the DB name, the DBMS administrator user-name, etc.
+
+#Template: dolibarr/db/host
+#Type: string
+#Default: localhost
+#Description: Please, insert your database host name:
+# This should be the host-name or IP address that dolibarr will use to access
+# the DB.
+
+#Template: dolibarr/db/port
+#Type: string
+#Default: 3306
+#Description: Please, insert your database port:
+# This should be the port value that Dolibarr will use to access
+# the DB.
+
+#Template: dolibarr/db/name
+#Type: string
+#Default: dolibarr
+#Description: Please, insert Dolibarr database name:
+# This is the name of the database that Dolibarr will use.
+
+#Template: dolibarr/db/user/name
+#Type: string
+#Default: dolibarr
+#Description: Please, insert the DBMS user-name to access the DB:
+# This is the user-name that Dolibarr will use to access the DB.
+
+#Template: dolibarr/db/user/password
+#Type: password
+#Description: Please, insert the password to access the DB:
+# This is the password that Dolibarr will use, along with user-name you
+# provided, to access the DB.
+
+#Template: dolibarr/db/user/password/confirm
+#Type: password
+#Description: Please, retype the password to access the DB:
+# Please insert the DB access password again. If the password you are going to
+# retype mismatch the previous inserted one, I'll ask you to insert them again.
+
+#Template: dolibarr/db/user/password/mismatch
+#Type: text
+#Description: Passwords mismatch
+# The DB access passwords you inserted mismatch. Please, try again.
+
+#Template: dolibarr/db/admin/name
+#Type: string
+#Default: root
+#Description: Please, insert the DBMS administrator user-name:
+# This user-name will be used to access the DBMS to create (if needed):
+# .
+# (1) The new Dolibarr database
+# (2) The new database account that Dolibarr will use to access the DB
+# .
+# It should be 'root' for MySql.
+
+#Template: dolibarr/db/admin/password
+#Type: password
+#Description: Please, insert the DBMS administrator password (if any):
+# This is the password that will be used along with the DBMS administrator
+# user-name.
+# .
+# NOTE: This password will not be asked twice, since it's not a new password.
+
+Template: dolibarr/postrm
+Type: boolean
+Default: true
+Description: Delete database ?
+ Delete the Dolibarr MySQL database and all its datas (datas related
+ to this quetion are the Dolibarr DBMS account and all
+ Dolibarr tables) ?
+
+#Template: dolibarr/postrmfile
+#Type: boolean
+#Default: true
+#Description: Delete attached files ?
+# Delete also all uploaded and generated files (datas related
+# to this quetion are all files found into /usr/share/dolibarr/documents,
+# uploaded or generated when using Dolibarr) ?
+
\ No newline at end of file
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 267045c71f4..533d6e1571d 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version $Id: makepack-dolibarr.pl,v 1.110 2011/07/18 01:48:21 eldy Exp $
+# \version $Id: makepack-dolibarr.pl,v 1.111 2011/07/21 01:20:31 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.110 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.111 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@@ -276,7 +276,7 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
- $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
@@ -461,8 +461,11 @@ if ($nboftargetok) {
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
- $ret=`cp -r "$SOURCE/build/deb/." "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
- $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/DEBIAN/CVS`;
+ $ret=`cp -r "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+ $ret=`cp -r "$SOURCE/build/deb/control" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+ $ret=`cp -r "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+ $ret=`cp -r "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+ $ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
print "Remove other files\n";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
@@ -479,6 +482,14 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/rollup`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/test`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
+
+ $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
# To remove once stable
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
@@ -508,14 +519,13 @@ if ($nboftargetok) {
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
- $ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/DEBIAN/README"`;
$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
- $ret=`cp "$BUILDROOT/$PROJECT.tmp/DEBIAN/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+ $ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
- #$ret=`gzip -9 -c $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/ChangeLog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
- $ret=`gzip -9 -c $BUILDROOT/$PROJECT.tmp/DEBIAN/changelog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+ #$ret=`gzip -9 -c $SOURCE/build/deb/changelog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+ $ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
print "Set owners on files/dir\n";
$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php
index 9153bb34cb8..b98da0c3e7b 100644
--- a/htdocs/product/canvas/default/product.default.class.php
+++ b/htdocs/product/canvas/default/product.default.class.php
@@ -20,7 +20,7 @@
* \file htdocs/product/canvas/default/product.default.class.php
* \ingroup produit
* \brief Fichier de la classe des produits par defaut
- * \version $Id: product.default.class.php,v 1.40 2011/07/08 21:52:07 eldy Exp $
+ * \version $Id: product.default.class.php,v 1.41 2011/07/21 01:20:33 eldy Exp $
*/
include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
@@ -45,7 +45,6 @@ class ProductDefault extends Product
$this->db = $DB;
$this->id = $id ;
$this->user = $user;
- //$this->smarty = 0;
$this->module = "produit";
$this->canvas = "default";
$this->name = "default";
diff --git a/htdocs/product/canvas/service/product.service.class.php b/htdocs/product/canvas/service/product.service.class.php
index d948c714cb1..3e291743a36 100644
--- a/htdocs/product/canvas/service/product.service.class.php
+++ b/htdocs/product/canvas/service/product.service.class.php
@@ -20,7 +20,7 @@
* \file htdocs/product/canvas/service/product.service.class.php
* \ingroup service
* \brief Fichier de la classe des services par defaut
- * \version $Id$
+ * \version $Id: product.service.class.php,v 1.14 2011/07/21 01:20:33 eldy Exp $
*/
/**
@@ -44,7 +44,6 @@ class ProductService extends Product
$this->db = $DB;
$this->id = $id ;
$this->user = $user;
- //$this->smarty = 0;
$this->module = "service";
$this->canvas = "service";
$this->name = "service";
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index fc333cc6435..f642438a8f8 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.88 2011/07/20 19:03:35 eldy Exp $
+ * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -1294,10 +1294,6 @@ font-family: <?php print $fontlist ?>;
td.highlights { background: #f9c5c6; }
-td.warning { /* Utilise par Smarty */
- background: #FF99A9;
-}
-
div.ok {
color: #114466;
}
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index fe222869fba..95d421f28c6 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -23,7 +23,7 @@
/**
* \file htdocs/theme/bureau2crea/style.css.php
* \brief Fichier de style CSS du theme bureau2crea
- * \version $Id: style.css.php,v 1.38 2011/07/06 11:40:21 eldy Exp $
+ * \version $Id: style.css.php,v 1.39 2011/07/21 01:20:32 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -1453,10 +1453,6 @@ font-family: <?php print $fontlist ?>;
td.highlights { background: #f9c5c6; }
-td.warning { /* Utilise par Smarty */
- background: #FF99A9;
-}
-
div.ok {
color: #114466;
}
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index b7c6eee9dfb..903e70c91a5 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -23,7 +23,7 @@
/**
* \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Cameleo
- * \version $Id: style.css.php,v 1.7 2011/07/17 20:16:38 hregis Exp $
+ * \version $Id: style.css.php,v 1.8 2011/07/21 01:20:33 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -1416,10 +1416,6 @@ font-family: <?php print $fontlist ?>;
.warning { color: #887711; }
.error { color: #550000; font-weight: bold; }
-td.warning { /* Utilise par Smarty */
- background: #FF99A9;
-}
-
div.ok {
color: #114466;
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f446c2b6df0..3a11f7e5dbc 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.86 2011/07/20 19:03:35 eldy Exp $
+ * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@@ -1260,10 +1260,6 @@ font-family: <?php print $fontlist ?>;
td.highlights { background: #f9c5c6; }
-td.warning { /* Utilise par Smarty */
- background: #FF99A9;
-}
-
div.ok {
color: #114466;
}
--
GitLab