cvsimport

build/deb/README

@@ -31,6 +31,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
 
 - Call for a mentor on ML debian-mentors to upload packages

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
+ Customers, Suppliers or Prospects directory
- * Contacts directory
+ Contacts directory
- * Orders management
+ Orders management
- * Commercial proposals management
+ Commercial proposals management
- * Invoices management
+ Invoices management
- * Products and services catalog
+ Products and services catalog
- * Stock management
+ Stock management
- * Foundations members management
+ Foundations members management
- * Bank accounts management
+ Bank accounts management
- * Point of Sale
+ Point of Sale
- * Payments management
+ Payments management
- * Commercial actions management
+ Commercial actions management
- * Contracts management
+ Contracts management
- * Standing orders management
+ Standing orders management
- * Shipping management
+ Shipping management
- * Donations management
+ Donations management
- * Bookmarks management
+ Bookmarks management
- * Mass Emailings
+ Mass Emailings
- * Reports
+ Reports
- * Data export and import tools
+ Data export and import tools
- * LDAP connectivity
+ LDAP connectivity
- * PDF exports
+ PDF exports
- * And a lot of more modules...
+ And a lot of more modules...
  .
  You can also add third parties external modules or develop yours.
  

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.
+Files: *
-See file /usr/share/common-licenses/GPL-2
+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'.

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')
+			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 | /bin/sed -e 's/^password[ =]*//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 
+		#if test -x /usr/bin/update-menus; then 
-			echo "update-menus"
+		#	echo "update-menus"
-			update-menus;
+		#	update-menus;
-		fi
+		#fi
 		
 		# TODO Create the file to force parameters in Web installer
 		#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null

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')
+				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 | /bin/sed -e 's/^password[ =]*//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)

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) ?
- 

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) ?
+ 

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=`cp -r "$SOURCE/build/deb/config"    "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/DEBIAN/CVS`;
+            $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 $SOURCE/build/deb/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`;
 
             print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;

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
 
-  
+- Check bug is into database by searching with id on https://bugzilla.redhat.com/  

htdocs/admin/mails.php

@@ -20,7 +20,7 @@
 /**
  *       \file       htdocs/admin/mails.php
  *       \brief      Page to setup emails sending
- *       \version    $Id: mails.php,v 1.73 2011/07/10 20:03:39 eldy Exp $
+ *       \version    $Id: mails.php,v 1.74 2011/07/20 13:01:04 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -592,8 +592,18 @@ else
 	print '</table>';
 
 
-	// Boutons actions
+    if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
+    {
+       $sendmailoption=ini_get('mail.force_extra_parameters');
+       //print 'x'.$sendmailoption;
+       if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption))
+       {
+            print '<br>'.info_admin($langs->trans("SendmailOptionNotComplete"));
+       }
+    }
 
+
+	// Boutons actions
 	print '<div class="tabsAction">';
 
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
@@ -737,5 +747,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/10 20:03:39 $ - $Revision: 1.73 $');
+llxFooter('$Date: 2011/07/20 13:01:04 $ - $Revision: 1.74 $');
 ?>

htdocs/cashdesk/COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

htdocs/categories/index.php

@@ -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>';
 
 
@@ -313,5 +313,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $');
 ?>

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 '<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 $');
 ?>

htdocs/comm/propal.php

@@ -27,7 +27,7 @@
  *	\file       	htdocs/comm/propal.php
  *	\ingroup    	propale
  *	\brief      	Page of commercial proposals card and list
- *	\version		$Id: propal.php,v 1.611 2011/07/17 19:01:28 eldy Exp $
+ *	\version		$Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $
  */
 
 require("../main.inc.php");
@@ -1824,10 +1824,16 @@ else
 
 		$num = $db->num_rows($result);
 
+	 	if ($socid)
+		{
+			$soc = new Societe($db);
+			 $soc->fetch($socid);
+		}
+            
 		$param='&socid='.$socid.'&viewstatut='.$viewstatut;
 		if ($month) $param.='&month='.$month;
 		if ($year) $param.='&year='.$year;
-		print_barre_liste($langs->trans('ListOfProposals'), $page,'propal.php',$param,$sortfield,$sortorder,'',$num);
+		print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num);
 
 		$i = 0;
 		print '<table class="liste" width="100%">';
@@ -1970,6 +1976,6 @@ else
 }
 $db->close();
 
-llxFooter('$Date: 2011/07/17 19:01:28 $ - $Revision: 1.611 $');
+llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $');
 
 ?>

htdocs/commande/fiche.php

@@ -26,7 +26,7 @@
  *	\file       htdocs/commande/fiche.php
  *	\ingroup    commande
  *	\brief      Page to show customer order
- *	\version    $Id: fiche.php,v 1.525 2011/07/10 20:03:41 eldy Exp $
+ *	\version    $Id: fiche.php,v 1.526 2011/07/20 21:26:11 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -1290,9 +1290,9 @@ if ($action == 'create' && $user->rights->commande->creer)
     $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
     print '</td></tr>';
 
-    // delai de livraison
+    // Delivery delay
     print '<tr><td>'.$langs->trans('AvailabilityPeriod').'</td><td colspan="2">';
-    $html->select_availability($propal->availability,'availability_id');
+    $html->select_availability($propal->availability,'availability_id','',1);
     print '</td></tr>';
 
     // What trigger creation
@@ -1645,7 +1645,7 @@ else
 
             if ($action != 'editdate' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
             print '</tr></table>';
-            print '</td><td colspan="2">';
+            print '</td><td colspan="3">';
             if ($action == 'editdate')
             {
                 print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
@@ -1660,16 +1660,6 @@ else
                 print $object->date ? dol_print_date($object->date,'daytext') : '&nbsp;';
             }
             print '</td>';
-
-            print '<td width="50%">'.$langs->trans('Source').' : '.$object->getLabelSource();
-            if ($object->source == 0 && $conf->propal->enabled && $object->propale_id)
-            {
-                // Si source = propal
-                $propal = new Propal($db);
-                $propal->fetch($object->propale_id);
-                print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$propal->id.'">'.$propal->ref.'</a>';
-            }
-            print '</td>';
             print '</tr>';
 
             // Delivery date planed
@@ -1728,17 +1718,16 @@ else
             print '<table class="nobordernopadding" width="100%"><tr><td>';
             print $langs->trans('PaymentConditionsShort');
             print '</td>';
-
             if ($action != 'editconditions' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
             print '</tr></table>';
             print '</td><td colspan="2">';
             if ($action == 'editconditions')
             {
-                $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+                $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id',1);
             }
             else
             {
-                $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+                $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none',1);
             }
             print '</td>';
 
@@ -1772,15 +1761,15 @@ else
             print '</td><td colspan="2">';
             if ($action == 'editavailability')
             {
-                $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id');
+                $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
             }
             else
             {
-                $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none');
+                $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
             }
             print '</td></tr>';
 
-            // Origine de la demande
+            // Source
             print '<tr><td height="10">';
             print '<table class="nobordernopadding" width="100%"><tr><td>';
             print $langs->trans('Source');
@@ -2134,5 +2123,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/10 20:03:41 $ - $Revision: 1.525 $');
+llxFooter('$Date: 2011/07/20 21:26:11 $ - $Revision: 1.526 $');
 ?>

htdocs/compta/bank/index.php

@@ -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 $');
 ?>

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 = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
-    $sql.= " WHERE fk_account=".$_GET["account"];
+    $sql.= " WHERE fk_account=".$_GET["account"]." AND num_releve IS NOT NULL";
-    $sql.= " ORDER BY num_releve DESC";
+    $sql.= $db->order("num_releve","DESC");
-    $sql.= " LIMIT ".($nbmax+1);
+    $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 $');
 ?>

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").'<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 $');
 ?>

htdocs/compta/paiement/fiche.php

@@ -24,7 +24,7 @@
  *		\ingroup    facture
  *		\brief      Page of a customer payment
  *		\remarks	Nearly same file than fournisseur/paiement/fiche.php
- *		\version    $Id$
+ *		\version    $Id: fiche.php,v 1.75 2011/07/20 12:37:23 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -348,7 +348,7 @@ if ($user->societe_id == 0 && $action == '')
 		}
 		else
 		{
-			print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
 }
@@ -357,5 +357,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/20 12:37:23 $ - $Revision: 1.75 $');
 ?>

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 '<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 $');
 ?>

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 '<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 $');
 
 ?>

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 '<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);

htdocs/exports/class/export.class.php

@@ -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
+ *	\brief      File of class to manage exports
- *	\version    $Id$
+ *	\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);
 		}
 	}
 

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

htdocs/langs/en_US/admin.lang

@@ -843,6 +843,8 @@ MAIN_PROXY_USER=Login to use the proxy server
 MAIN_PROXY_PASS=Password to use the proxy server
 DefineHereComplementaryAttributes=Define here all atributes, not already available by default, and that you want to be supported for %s.
 ExtraFields=Complementary attributes
+SendingMailSetup=Setup of sendings by email
+SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must conatins option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
 
 ##### Module password generation
 PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.

htdocs/langs/en_US/bills.lang

@@ -363,7 +363,7 @@ ValidateInvoice=Validate invoice
 Cash=Cash
 Reported=Delayed
 DisabledBecausePayments=Not possible since there is some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least on invoice classified payed
+CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed
 ExpectedToPay=Expected payment
 PayedByThisPayment=Payed by this payment
 ClosePaidInvoicesAutomatically=Classify "Payed" all invoices entierely payed. 

htdocs/langs/en_US/main.lang

@@ -35,7 +35,7 @@ ErrorInternalErrorDetected=Error detected
 ErrorNoRequestRan=No request ran
 ErrorWrongHostParameter=Wrong host parameter
 ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least on child records.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
 ErrorWrongValue=Wrong value
 ErrorWrongValueForParameterX=Wrong value for parameter %s
 ErrorNoRequestInError=No request in error

htdocs/langs/fr_FR/admin.lang

@@ -856,6 +856,7 @@ MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
 DefineHereComplementaryAttributes=Definissez ici la liste des attributs supplémentaire, non disponible en standard, et que vous voulez voir gérez sur les %s.
 ExtraFields=Attributs suplémentaires
 SendingMailSetup=Configuration de l'envoi par mail
+SendmailOptionNotComplete=Attention, sur certains systèmes Linux, avec cette méthode d'envoi, pour pouvoir envoyer des mails en votre nom, la configuration d'exécution de sendmail doit contenir l'option <b>-ba</b> (paramètre <b>mail.force_extra_parameters</b> dans le fichier <b>php.ini</b>). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifer ce paramètre PHP avec <b>mail.force_extra_parameters = -ba</b>.
 
 ##### Module password generation= undefined
 PasswordGenerationStandard= Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés.

htdocs/lib/CMailFile.class.php

@@ -25,7 +25,7 @@
 /**
  *      \file       htdocs/lib/CMailFile.class.php
  *      \brief      File of class to send emails (with attachments or not)
- *		\version    $Id: CMailFile.class.php,v 1.145 2011/07/09 06:10:04 hregis Exp $
+ *		\version    $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $
  *      \author     Dan Potter.
  *      \author	    Eric Seigne
  *      \author	    Laurent Destailleur.
@@ -57,11 +57,6 @@ class CMailFile
 
 	var $smtps;			// Contains SMTPs object (if this method is used)
 
-	// simplemail
-	//var $simplemail;  // Contains simplemail object (if this method is used)
-	//var $sName;
-	//var $sEmail;
-
 	//CSS
 	var $css;
 	//! Defined css style for body background
@@ -87,6 +82,7 @@ class CMailFile
 
 	/**
 	 *	CMailFile
+	 *
 	 *	@param 	subject             Topic/Subject of mail
 	 *	@param 	to                  Recipients emails (RFC 2822: "Nom prenom <email>[, ...]" ou "email[, ...]" ou "<email>[, ...]")
 	 *	@param 	from                Sender email      (RFC 2822: "Nom prenom <email>[, ...]" ou "email[, ...]" ou "<email>[, ...]")
@@ -107,10 +103,10 @@ class CMailFile
 	{
 		global $conf;
 
-		// On definit fin de ligne
+		// We define end of line (RFC 822bis section 2.3)
-		$this->eol="\n";
+		$this->eol="\r\n";
-		if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
+		//if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
-		if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
+		//if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
 
 		// On defini mixed_boundary
 		$this->mixed_boundary = md5(uniqid("dolibarr1"));
@@ -344,13 +340,17 @@ class CMailFile
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG);
 
 					$bounce = '';	// By default
-					if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)
+					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
 					{
 						// le return-path dans les header ne fonctionne pas avec tous les MTA
 						// Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse)
-						$bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') );
+						$bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') );
 					}
+                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+                    {
+                        $bounce .= ($bounce?' ':'').'-ba';
+                    }
 
 					$this->message=stripslashes($this->message);
 
@@ -465,7 +465,7 @@ class CMailFile
 	}
 
 	/**
-	 * Read a file on disk and return encoded content for emails
+	 * Read a file on disk and return encoded content for emails (mode = 'mail')
 	 *
 	 * @param      sourcefile
 	 * @return     <0 if KO, encoded string if OK
@@ -611,7 +611,7 @@ class CMailFile
 
 
 	/**
-	 * Creation header MIME (mode = 'mail')
+	 * Create header MIME (mode = 'mail')
 	 *
 	 * @param 		filename_list
 	 * @param 		mimefilename_list
@@ -640,7 +640,7 @@ class CMailFile
 	}
 
 	/**
-	 * Permet d'ecrire le corps du message (mode = 'mail')
+	 * Return email content (mode = 'mail')
 	 *
 	 * @param 		msgtext
 	 */
@@ -704,7 +704,7 @@ class CMailFile
 	}
 
 	/**
-	 * Permet d'attacher un fichier (mode = 'mail')
+	 * Attach file to email (mode = 'mail')
 	 *
 	 * @param 		filename_list		Tableau
 	 * @param 		mimetype_list		Tableau
@@ -749,7 +749,7 @@ class CMailFile
 
 
 	/**
-	 * Permet d'attacher une image (mode = 'mail')
+	 * Attach an image to email (mode = 'mail')
 	 *
 	 * @param 		images_list		Tableau
 	 * @return		out				Chaine images encodees
@@ -781,6 +781,7 @@ class CMailFile
 
 	/**
 	 * Try to create a socket connection
+	 *
 	 * @param 		$host		Add ssl:// for SSL/TLS.
 	 * @param 		$port		Example: 25, 465
 	 * @return 		Socket id if ok, 0 if KO
@@ -817,9 +818,9 @@ class CMailFile
 	}
 
 	/**
-	 * This function has been modified as provided
+	 * This function has been modified as provided by SirSir to allow multiline responses when
-     * by SirSir to allow multiline responses when
 	 * using SMTP Extensions.
+	 *
 	 * @param      socket
 	 * @param      response
 	 * @return     boolean
@@ -848,9 +849,9 @@ class CMailFile
 	}
 
 	/**
-	 * Recherche la presence d'images dans le message html
+	 * Seearch images into html message and init array this->images_encoded if found
 	 *
-	 * @param 		images_dir		Emplacement des images
+	 * @param 		images_dir		Location of physical images files
 	 * @return		int         	>0 if OK, <0 if KO
 	 */
 	function findHtmlImages($images_dir)
@@ -938,6 +939,7 @@ class CMailFile
 
 	/**
 	 * Return an address for SMTP protocol
+	 *
 	 * @param       adresses		Example: 'John Doe <john@doe.com>' or 'john@doe.com'
 	 * @param		format			0=Auto, 1=emails with <>, 2=emails without <>
 	 * @param		encode			1=Encode name to RFC2822

htdocs/lib/pdf.lib.php

@@ -25,7 +25,7 @@
  *	\file       htdocs/lib/pdf.lib.php
  *	\brief      Set of functions used for PDF generation
  *	\ingroup    core
- *	\version    $Id: pdf.lib.php,v 1.96 2011/07/04 08:53:01 eldy Exp $
+ *	\version    $Id: pdf.lib.php,v 1.97 2011/07/20 13:32:25 eldy Exp $
  */
 
 
@@ -324,7 +324,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0)
 
     $outputlangs->load("banks");
 
-    // Get format of bank id according to country of $account
+    // Get format of bank account according to its country
     $usedetailedbban=$account->useDetailedBBAN();
 
     //$onlynumber=0; $usedetailedbban=0; // For tests
@@ -425,7 +425,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0)
 
     $pdf->SetFont('','',6);
 
-    if (empty($onlynumber))
+    if (empty($onlynumber) && ! empty($account->domiciliation))
     {
         $pdf->SetXY ($curx, $cury);
         $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);

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

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

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.89 2011/07/21 01:20:33 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;
@@ -1276,10 +1294,6 @@ font-family: <?php print $fontlist ?>;
 
 td.highlights { background: #f9c5c6; }
 
-td.warning {	/* Utilise par Smarty */
-  background: #FF99A9;
-}
-
 div.ok {
   color: #114466;
 }

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

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

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.87 2011/07/21 01:20:33 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;
@@ -1254,10 +1260,6 @@ font-family: <?php print $fontlist ?>;
 
 td.highlights { background: #f9c5c6; }
 
-td.warning {	/* Utilise par Smarty */
-  background: #FF99A9;
-}
-
 div.ok {
   color: #114466;
 }

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;

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;