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

Fix: Avoid errors into rpm packages

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-03 01:13:30 +00:00
parent 4bc43cca36
commit 582dac42b3
201 changed files with 793 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
build/deb/control.debianbin Executable file
View File

@ -0,0 +1,46 @@
Package: dolibarr
Version: __VERSION__
Architecture: all
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
Installed-Size: 61200
Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
Section: web
Priority: optional
Homepage: http://www.dolibarr.org
Description: Easy to use web based ERP & CRM software
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
It's a web software you can install as a standalone program or on any web
hosting provider to use it from anywhere with any web browser.
Dolibarr was designed to provide only features you need and be easy to use.
.
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,
Wizards to export and import data,
LDAP connectivity,
PDF exports,
And a lot of more modules...
.
You can also add third parties external modules or develop yours.

4
build/deb/dolibarr.desktop
View File

@ -3,10 +3,14 @@
# It must be saved into directory /usr/share/applications
Version=1.0
Name=Dolibarr ERP & CRM
Name[es]=Dolibarr ERP & CRM
Name[fr]=Dolibarr ERP & CRM
Name[it]=Dolibarr ERP & CRM
GenericName=Dolibarr ERP & CRM
Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
# Command to open an URL
# For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser

137
build/makepack-dolibarr.pl
View File

@ -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.129 2011/08/01 18:22:26 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 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.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@ -306,21 +306,23 @@ if ($nboftargetok) {
$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* $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/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
}
# Build package for each target
@ -443,57 +445,61 @@ if ($nboftargetok) {
#rmdir "$BUILDROOT/$FILENAMETGZ2";
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\"";
print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n";
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\"";
$ret=`$cmd`;
print "Remove other files\n";
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
# To remove once stable
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
# Apache conf files
#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n";
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
$ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`;
# Dolibarr conf files
# TODO
@ -518,21 +524,21 @@ if ($nboftargetok) {
$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
# Build tgz
@ -569,7 +575,7 @@ if ($nboftargetok) {
next;
}
if ($target eq 'DEB')
{
$olddir=getcwd();
@ -608,7 +614,7 @@ if ($nboftargetok) {
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error";
open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error";
open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
while (<SPECFROM>) {
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
@ -662,6 +668,7 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;

13
build/rpm/README
View File

@ -5,17 +5,24 @@ RPM Package tools
This directory contains files used by makepack-dolibarr.pl
script to build a package, ready to be distributed,
with format RPM (for Redhat, Mandriva, ...).
with format RPM (for Redhat, OpenSuse, Mandriva, ...).
# This is standard command to work on Debian packaging:
# This is standard command to work on RPM packaging:
#
# yum -y install rpmlint
# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it
#
# rpmlint file.rpm Test a package
# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
#
# On Fedora
# rpm -i --test dolibarr-...rpm To list dependencies of RPM
# yum install dolibarr-...rpm To install package and dependencies
# yum erase dolibarr To remove package
# yum erase dolibarr To remove package
# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file
# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local)
# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage)
#
# On OpenSuse
# yast --install dolibarr-...rpm To install package and dependencies

3
build/rpm/dolibarr.desktop
View File

@ -4,13 +4,14 @@
Version=1.0
Encoding=UTF-8
Name=Dolibarr ERP & CRM
Name[es]=Dolibarr ERP & CRM
Name[fr]=Dolibarr ERP & CRM
Name[it]=Dolibarr ERP & CRM
GenericName=Dolibarr ERP & CRM
Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
# Command to open an URL
# For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser

157
build/rpm/dolibarr.spec
View File

@ -5,6 +5,11 @@
# file to build a package for your own distributions and
# edit it if you need to match your rules.
# --------------------------------------------------------
#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
%define name dolibarr
%define version __VERSION__
%define release __RELEASE__
@ -12,9 +17,12 @@
Name: %{name}
Version: %{version}
Release: %{release}
Summary: Dolibarr
Summary: ERP and CRM software for small and medium companies or foundations
Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
License: GPL
License: GPLv2+
Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
Vendor: Dolibarr dev team
@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to
use.
%description -l es
Un software ERP y CRM open source/gratis para pequeñas y
medianas empresas, asociaciones o autónomos. Incluye diferentes
funcionalidades para la Planificación de Recursos Empresariales (ERP) y
Gestión de la Relación con los Clientes (CRM) así como para para otras
diferentes actividades. Dolibarr ha sido diseñado para suministrarle
solamente las funcionalidades que necesita y haciendo hincapié en su
facilidad de uso.
Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
o autónomos. Incluye diferentes funcionalidades para la Planificación
de Recursos Empresariales (ERP) y Gestión de la Relación con los
Clientes (CRM) así como para para otras diferentes actividades.
Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
que necesita y haciendo hincapié en su facilidad de uso.
%description -l fr
Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs,
@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
et bien d'autres choses dans une interface pensée pour la simplicité.
%description -l it
Un programma gestionale open source e gratuito per piccole e medie
Un programmo gestionale per piccole e medie
imprese, fondazioni e liberi professionisti. Include varie funzionalità per
Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno
attività. Progettato per poter fornire solo ciò di cui hai bisogno
ed essere facile da usare.
Dolibar è completamente web-based, progettato per poter fornire solo ciò di
Programmo web, progettato per poter fornire solo ciò di
cui hai bisogno ed essere facile da usare.
@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release}
#---- install
%install
rm -rf $RPM_BUILD_ROOT
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
# %{_datadir} = /usr/share
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README
install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT
cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr
cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr
cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr
cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr
%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT
#---- clean
%clean
rm -rf $RPM_BUILD_ROOT
%{__rm} -rf $RPM_BUILD_ROOT
#---- files
%files
%defattr(-,root,root)
%doc README
%doc COPYRIGHT
%doc /var/www/dolibarr/doc/*
%dir /var/www/dolibarr/build
%dir /var/www/dolibarr/htdocs
%dir /var/www/dolibarr/scripts
%_datadir/pixmaps/*
%_datadir/pixmaps/dolibarr.png
%_datadir/applications/%{name}.desktop
/var/www/dolibarr/build/*
/var/www/dolibarr/htdocs/*
/var/www/dolibarr/scripts/*
/var/www/dolibarr/README
/var/www/dolibarr/COPYRIGHT
#%config /var/www/dolibarr/htdocs/conf/conf.php
%defattr(0664, -, -, 0755)
%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
#---- post (after unzip during install)
@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr"
export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="%{_sysconfdir}/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock"
#export config="/usr/share/dolibarr/htdocs/conf/conf.php"
export config="%{_sysconfdir}/dolibarr/conf.php"
export lockfile="/usr/share/dolibarr/install.lock"
# Detect OS
@ -192,8 +201,8 @@ echo OS detected: $os
# Create empty directory for uploaded files and generated documents
echo Create document directory $docdir
mkdir -p $docdir
mkdir -p %{_sysconfdir}/dolibarr
%{__mkdir} -p $docdir
%{__mkdir} -p %{_sysconfdir}/dolibarr
# Create install.forced.php into Dolibarr install directory
superuserlogin=''
@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
fi
echo Mysql superuser found to use is $superuserlogin
if [ -z "$superuserlogin" ] ; then
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
%{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
else
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
%{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
fi
chown -R root:$apachegroup $installconfig
chmod -R 660 $installconfig
%{__chown} -R root:$apachegroup $installconfig
%{__chmod} -R 660 $installconfig
# Create an empty conf.php with permission to web server
if [ ! -f $config ]
@ -222,19 +231,20 @@ then
fi
# Create config file for apache $apacheconfig
if [ ! -f $apacheconfig ]; then
echo Create dolibarr web server config file $apacheconfig
cp $apachefileorig $apacheconfig
chmod a-x $apacheconfig
chmod go-w $apacheconfig
fi
# Create config file for se $seconfig
if [ ! -f $seconfig ]; then
echo Create se config file $seconfig
cp $sefileorig $seconfig
#if [ ! -f $apacheconfig ]; then
# echo Create dolibarr web server config file $apacheconfig
# cp $apachefileorig $apacheconfig
# chmod a-x $apacheconfig
# chmod go-w $apacheconfig
#fi
# Create config file for se $seconfig
if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then
echo Add SE Linux permission from file $sefileorig
# cp $sefileorig $seconfig
restorecon -R -v /etc/dolibarr
restorecon -R -v /var/www/dolibarr
restorecon -R -v /usr/share/dolibarr
fi
# Create a config link dolibarr.conf
@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir
chown -R $apacheuser:$apachegroup $docdir
chmod -R o-w $docdir
# Set SE Linux on OS SE is enabled
if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
echo Set SELinux permissions
# Warning: chcon seems not cumulative
#chcon -R -h -t httpd_sys_content_t $targetdir
#chcon -R -h -t httpd_sys_content_t $docdir
chcon -R -h -t httpd_sys_script_rw_t $targetdir
chcon -R -h -t httpd_sys_script_rw_t $docdir
chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr
#chcon -R -h -t httpd_sys_script_exec_t $targetdir
fi
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
# Restart mysql
echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
fi
# Show result
echo
echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="%{_sysconfdir}/dolibarr/conf.php"
lockfile="$targetdir/install.lock"
#export config="/usr/share/dolibarr/htdocs/conf/conf.php"
export config="%{_sysconfdir}/dolibarr/conf.php"
export lockfile="$targetdir/install.lock"
# Detect OS
@ -338,7 +342,7 @@ echo OS detected: $os
if [ -f $apachelink ] ;
then
echo Delete apache config link for Dolibarr
rm -f $apachelink
%{__rm} -f $apachelink
status=purge
fi
@ -356,18 +360,15 @@ then
fi
# Removed dirs after apache restart
echo Removed remaining $apacheconfig
rm -f $apacheconfig
echo Removed remaining $config
rm -f $config
%{__rm} -f $config
echo Removed remaining $installconfig
rm -f $installconfig
%{__rm} -f $installconfig
echo Removed remaining $lockfile
rm -f $lockfile
%{__rm} -f $lockfile
echo Removed remaining dir $targetdir/doc
rmdir $targetdir/doc >/dev/null 2>&1
#echo Removed remaining dir $targetdir/htdocs
#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm
%changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1

6
build/rpm/file_contexts.dolibarr
View File

@ -1,3 +1,3 @@
/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0

5
htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql → dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql Normal file → Executable file
View File

@ -12,10 +12,9 @@
-- 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.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
-- ===================================================================
CREATE TABLE llx_osc_categories (

5
htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql → dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql Normal file → Executable file
View File

@ -12,10 +12,9 @@
-- 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.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
-- ===================================================================

5
htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql → dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql Normal file → Executable file
View File

@ -12,10 +12,9 @@
-- 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.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
-- ===================================================================
CREATE TABLE llx_osc_customer (

5
htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql → dev/dbmodel/emulate_oscommerce/llx_osc_order.sql Normal file → Executable file
View File

@ -12,10 +12,9 @@
-- 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.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
-- ===================================================================
CREATE TABLE llx_osc_order (

5
htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql → dev/dbmodel/emulate_oscommerce/llx_osc_product.sql Normal file → Executable file
View File

@ -12,10 +12,9 @@
-- 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.
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- $Id$
-- $Id: llx_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
-- ===================================================================
CREATE TABLE llx_osc_product (

2
doc/images/README
View File

@ -12,5 +12,3 @@ Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com
-------------------------------------------------------
List of icons from http://led24.de/iconset/ are:
- dolihelp.ico

5
htdocs/accountancy/class/accountancyaccount.class.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/accountancy/class/accountancyaccount.class.php
* \ingroup accounting
* \brief Fichier de la classe des comptes comptables
* \version $Id$
* \version $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $
*/

5
htdocs/accountancy/class/accountancysystem.class.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/accountancy/class/accountancysystem.class.php
* \ingroup accounting
* \brief File of class to manage accountancy systems
* \version $Id$
* \version $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $
*/

7
htdocs/adherents/admin/adherent.php
View File

@ -18,15 +18,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/admin/adherent.php
* \ingroup member
* \brief Page to setup the module Foundation
* \version $Id$
* \version $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $
*/
require("../../main.inc.php");
@ -332,7 +331,7 @@ $db->close();
print '<br>';
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $');

7
htdocs/adherents/admin/adherent_extrafields.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/admin/adherent_extrafields.php
* \ingroup member
* \brief Page to setup extra fields of members
* \version $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $
* \version $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $
*/
require("../../main.inc.php");
@ -312,5 +311,5 @@ if ($_GET["attrname"] && $action == 'edit')
$db->close();
llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $');
?>

7
htdocs/adherents/admin/public.php
View File

@ -13,8 +13,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -22,7 +21,7 @@
* \ingroup member
* \brief File of main public page for member module
* \author Laurent Destailleur
* \version $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $
* \version $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $
*/
require("../../main.inc.php");
@ -187,5 +186,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $');
?>

9
htdocs/adherents/cartes/carte.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/cartes/carte.php
* \ingroup member
* \brief Page to output members business cards
* \version $Id$
* \version $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
@ -88,7 +87,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg)
print '</form>';
print '<br>';
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $');
}
else
{
@ -211,7 +210,7 @@ else
{
dol_print_error($db);
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $');
}
}

5
htdocs/adherents/class/adherent.class.php
View File

@ -17,15 +17,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/class/adherent.class.php
* \ingroup member
* \brief File of class to manage members of a foundation
* \version $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $
* \version $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

5
htdocs/adherents/class/adherent_type.class.php
View File

@ -14,8 +14,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -23,7 +22,7 @@
* \ingroup member
* \brief File of class to manage members types
* \author Rodolphe Quiedeville
* \version $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $
* \version $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

5
htdocs/adherents/class/adherentstats.class.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/class/adherentstats.class.php
* \ingroup member
* \brief Fichier de la classe de gestion des stats des adhérents
* \version $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $
* \version $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $
*/
include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";

5
htdocs/adherents/class/cotisation.class.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/class/cotisation.class.php
* \ingroup member
* \brief File of class to manage subscriptions of foundation members
* \version $Id$
* \version $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

7
htdocs/adherents/stats/geo.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/stats/index.php
* \ingroup member
* \brief Page des stats
* \version $Id$
* \version $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $
*/
require("../../main.inc.php");
@ -276,5 +275,5 @@ dol_fiche_end();
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $');
?>

7
htdocs/adherents/stats/index.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/adherents/stats/index.php
* \ingroup member
* \brief Page of subscription members statistics
* \version $Id$
* \version $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $
*/
require("../../main.inc.php");
@ -228,5 +227,5 @@ dol_fiche_end();
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
?>

7
htdocs/admin/tools/dolibarr_export.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/dolibarr_export.php
* \ingroup core
* \brief Page to export database
* \version $Id$
* \version $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -332,5 +331,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $');
?>

7
htdocs/admin/tools/dolibarr_import.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/dolibarr_import.php
* \ingroup core
* \brief Page to import database
* \version $Id$
* \version $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -185,5 +184,5 @@ else if ($db->label == 'PostgreSQL')
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $');
?>

9
htdocs/admin/tools/eaccelerator.php
View File

@ -12,14 +12,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/eaccelerator.php
* \brief Page administration de eaccelerator
* \version $Id$
* \version $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -40,7 +39,7 @@ llxHeader();
if (!function_exists('eaccelerator_info'))
{
print 'eAccelerator is not installed.';
llxfooter('$Date$ - $Revision$');
llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
exit;
}
@ -339,5 +338,5 @@ print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http:/
print "</td></tr></table>";
llxfooter('$Date$ - $Revision$');
llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
?>

7
htdocs/admin/tools/export.php
View File

@ -12,14 +12,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/export.php
* \brief Page to export a database into a dump file
* \version $Id$
* \version $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -317,5 +316,5 @@ print '<br>';
$time_end = time();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $');
?>

7
htdocs/admin/tools/index.php
View File

@ -13,14 +13,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/index.php
* \brief Page d'accueil de l'espace outils admin
* \version $Id$
* \version $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -57,5 +56,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'<br>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $');
?>

7
htdocs/admin/tools/listevents.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/listevents.php
* \ingroup core
* \brief List of security events
* \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $
* \version $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -256,5 +255,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $');
?>

7
htdocs/admin/tools/listsessions.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/listsessions.php
* \ingroup core
* \brief List of PHP sessions
* \version $Id$
* \version $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -211,5 +210,5 @@ print '<br>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $');
?>

7
htdocs/admin/tools/purge.php
View File

@ -12,14 +12,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/purge.php
* \brief Page to purge files (temporary or not)
* \version $Id$
* \version $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -172,5 +171,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"]))
}
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $');
?>

7
htdocs/admin/tools/update.php
View File

@ -13,14 +13,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/tools/update.php
* \brief Page to make a Dolibarr online upgrade
* \version $Id$
* \version $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
*/
require("../../main.inc.php");
@ -144,5 +143,5 @@ print $langs->trans("SetupIsReadyForUse").'<br>';
print '</form>';
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
?>

3
htdocs/asterisk/cidlookup.php
View File

@ -12,8 +12,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**

5
htdocs/asterisk/wrapper.php
View File

@ -12,14 +12,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/asterisk/wrapper.php
* \brief File that is entry point to call an Asterisk server
* \version $Id$
* \version $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $
* \remarks To be used, an Asterisk user must be created by adding this
* in /etc/asterisk/manager.conf
* [dolibarr]

7
htdocs/bookmarks/admin/bookmark.php
View File

@ -13,14 +13,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file htdocs/bookmarks/admin/bookmark.php
* \ingroup bookmark
* \brief Page to setup bookmark module
* \version $Id$
* \version $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $
*/
require("../../main.inc.php");
@ -84,5 +83,5 @@ print '</table></form>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $');
?>

5
htdocs/bookmarks/bookmarks.lib.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/bookmarks/bookmarks.lib.php
* \ingroup bookmarks
* \brief File with library for bookmark module
* \version $Id$
* \version $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $
*/
/**

5
htdocs/bookmarks/class/bookmark.class.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/bookmarks/class/bookmark.class.php
* \ingroup bookmark
* \brief File of class to manage bookmarks
* \version $Id$
* \version $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $
*/

7
htdocs/bookmarks/fiche.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/bookmarks/fiche.php
* \brief Page display/creation of bookmarks
* \ingroup bookmark
* \version $Id$
* \version $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $
*/
@ -285,5 +284,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"]))
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $');
?>

7
htdocs/bookmarks/liste.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/bookmarks/liste.php
* \brief Page to display list of bookmarks
* \ingroup bookmark
* \version $Id$
* \version $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $
*/
require("../main.inc.php");
@ -207,5 +206,5 @@ print '</div>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $');
?>

9
htdocs/boutique/admin/boutique.php
View File

@ -15,17 +15,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $
*/
/**
* \file htdocs/boutique/admin/boutique.php
* \ingroup boutique
* \brief Page d'administration/configuration du module OsCommerce
* \version $Revision$
* \version $Revision: 1.2 $
*/
require("../../main.inc.php");
@ -214,5 +213,5 @@ print "<br>";
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $');
?>

7
htdocs/boutique/client/class/boutiqueclient.class.php
View File

@ -12,10 +12,9 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $
*
*/
@ -23,7 +22,7 @@
* \file htdocs/boutique/client/class/boutiqueclient.class.php
* \brief Classe permettant de gerer des clients de la boutique online
* \author Rodolphe Quiedeville
* \version $Revision$
* \version $Revision: 1.2 $
*/
/**

9
htdocs/boutique/client/fiche.php
View File

@ -14,17 +14,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $
*/
/**
* \file htdocs/boutique/client/fiche.php
* \ingroup boutique
* \brief Page fiche client OSCommerce
* \version $Revision$
* \version $Revision: 1.22 $
*/
require("../../main.inc.php");
@ -129,5 +128,5 @@ else
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $');
?>

9
htdocs/boutique/client/index.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $
*/
/**
\file htdocs/boutique/client/index.php
\ingroup boutique
\brief Page gestion client OSCommerce
\version $Revision$
\version $Revision: 1.17 $
*/
require("../../main.inc.php");
@ -91,5 +90,5 @@ else
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $');
?>

9
htdocs/boutique/commande/ca.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
*/
/**
\file htdocs/boutique/commande/ca.php
\ingroup boutique
\brief Page ca commandes du module OsCommerce
\version $Revision$
\version $Revision: 1.17 $
*/
require("../../main.inc.php");
@ -115,5 +114,5 @@ print "</table>";
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
?>

5
htdocs/boutique/commande/class/boutiquecommande.class.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/boutique/commande/class/boutiquecommande.class.php
* \ingroup osc
* \brief Fichier de la classe des commandes de la boutique online
* \version $Id$
* \version $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php");

9
htdocs/boutique/commande/fiche.php
View File

@ -14,17 +14,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $
*/
/**
\file htdocs/boutique/commande/fiche.php
\ingroup boutique
\brief Page fiche commande OSCommerce
\version $Revision$
\version $Revision: 1.24 $
*/
require("../../main.inc.php");
@ -155,5 +154,5 @@ print '</table><br>';
$dbosc->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter("<em>Derni&egrave;re modification $Date: 2011/08/03 00:45:44 $ r&eacute;vision $Revision: 1.24 $</em>");
?>

9
htdocs/boutique/commande/index.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $
*/
/**
\file htdocs/boutique/commande/index.php
\ingroup boutique
\brief Page gestion commandes OSCommerce
\version $Revision$
\version $Revision: 1.23 $
*/
require("../../main.inc.php");
@ -92,5 +91,5 @@ else
$dbosc->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter("<em>Derni&egrave;re modification $Date: 2011/08/03 00:45:43 $ r&eacute;vision $Revision: 1.23 $</em>");
?>

11
htdocs/boutique/critiques/bestproduct.php
View File

@ -14,18 +14,17 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Source$
* $Id: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $
*/
/**
\file htdocs/boutique/critiques/bestproduct.php
\ingroup boutique
\brief Page affichage meilleures critiques OS Commerce
\version $Revision$
\version $Revision: 1.10 $
*/
require("../../main.inc.php");
@ -99,5 +98,5 @@ print "</TABLE>";
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $');
?>

5
htdocs/boutique/critiques/class/critique.class.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/boutique/critiques/class/critique.class.php
* \ingroup osc
* \brief Fichier de la classe des critiques OSCommerce
* \version $Id$
* \version $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $
*/

9
htdocs/boutique/critiques/fiche.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $
*/
/**
\file htdocs/boutique/critiques/fiche.php
\ingroup boutique
\brief Page fiche critique OS Commerce
\version $Revision$
\version $Revision: 1.5 $
*/
require("../../main.inc.php");
@ -81,6 +80,6 @@ print '</table><br>';
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $');
?>

9
htdocs/boutique/critiques/index.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $
*/
/**
\file htdocs/boutique/critiques/index.php
\ingroup boutique
\brief Page gestion critiques OSCommerce
\version $Revision$
\version $Revision: 1.10 $
*/
require("../../main.inc.php");
@ -92,5 +91,5 @@ print "</TABLE>";
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $');
?>

13
htdocs/boutique/index.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/boutique/index.php
\ingroup boutique
\brief Page accueil zone boutique
\version $Id$
* \file htdocs/boutique/index.php
* \ingroup boutique
* \brief Page accueil zone boutique
* \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $
*/
require("../main.inc.php");
@ -239,5 +238,5 @@ print '</tr></table>';
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $');
?>

7
htdocs/boutique/notification/fiche.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/boutique/notification/fiche.php
\ingroup boutique
\brief Page fiche notification OS Commerce
\version $Id$
\version $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $
*/
require("../../main.inc.php");
@ -150,5 +149,5 @@ print '</div>';
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $');
?>

9
htdocs/boutique/notification/index.php
View File

@ -14,17 +14,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $
*/
/**
\file htdocs/boutique/notification/index.php
\ingroup boutique
\brief Page gestion notification OS Commerce
\version $Revision$
\version $Revision: 1.19 $
*/
require("../../main.inc.php");
@ -89,5 +88,5 @@ else
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $');
?>

9
htdocs/boutique/notification/produits.php
View File

@ -14,17 +14,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $
*/
/**
\file htdocs/boutique/notification/produits.php
\ingroup boutique
\brief Page fiche notification produits OS Commerce
\version $Revision$
\version $Revision: 1.16 $
*/
require("../../main.inc.php");
@ -95,5 +94,5 @@ else
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $');
?>

11
htdocs/boutique/osc_master.inc.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/boutique/osc_master.inc.php
\brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce
\version $Id$
*/
* \file htdocs/boutique/osc_master.inc.php
* \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce
* \version $Id: osc_master.inc.php,v 1.6 2011/08/03 01:17:17 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");

9
htdocs/boutique/produits/index.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $
*/
/**
\file htdocs/boutique/produits/index.php
\ingroup boutique
\brief Page gestion produits du module OsCommerce
\version $Revision$
\version $Revision: 1.8 $
*/
require("../../main.inc.php");
@ -88,5 +87,5 @@ else
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $');
?>

9
htdocs/boutique/produits/osc-liste.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $
*/
/**
\file htdocs/boutique/produits/osc-liste.php
\ingroup boutique
\brief Page gestion produits du module OsCommerce
\version $Revision$
\version $Revision: 1.10 $
*/
require("../../main.inc.php");
@ -106,5 +105,5 @@ print "</TABLE>";
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
?>

5
htdocs/boutique/promotion/class/promotion.class.php
View File

@ -12,10 +12,9 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $
*/
class Promotion {

7
htdocs/boutique/promotion/index.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/boutique/promotion/index.php
\ingroup boutique
\brief Page gestion promotions OSCommerce
\version $Id$
\version $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $
*/
require("../../main.inc.php");
@ -117,6 +116,6 @@ else
}
$dbosc->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $');
?>

7
htdocs/cashdesk/admin/cashdesk.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/cashdesk/admin/cashdesk.php
* \ingroup cashdesk
* \brief Setup page for cashdesk module
* \version $Id$
* \version $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $
*/
require("../../main.inc.php");
@ -129,5 +128,5 @@ print '<center><input type="submit" class="button" value="'.$langs->trans("Save"
print "</form>\n";
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $');
?>

3
htdocs/cashdesk/class/Auth.class.php
View File

@ -13,8 +13,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

3
htdocs/cashdesk/class/Facturation.class.php
View File

@ -14,8 +14,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');

3
htdocs/cashdesk/include/environnement.php
View File

@ -13,8 +13,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// This file initializes more variables to already initialized variables with main.inc.php

3
htdocs/cashdesk/include/fonctions.php
View File

@ -12,8 +12,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Cr<43>ation al<61>atoire de chaines de caract<63>res de longueur $taille pass<73>e en argument

3
htdocs/cashdesk/javascript/facturation1.js
View File

@ -12,8 +12,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Calcul et affichage en temps reel des informations sur le produit en cours

5
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -19,10 +19,9 @@ 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.
along with this program. If not, see <http://www.gnu.org/licenses/>.
$Id$
$Id: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $
-->
<script type="text/javascript" src="javascript/facturation1.js"></script>
<script type="text/javascript" src="javascript/dhtml.js"></script>

3
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -23,8 +23,7 @@ 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.
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<div class="liste_articles_haut">
<div class="liste_articles_bas">

13
htdocs/cashdesk/tpl/menu.tpl.php
View File

@ -15,8 +15,7 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@ -63,11 +62,13 @@ $logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->them
print '<div class="menu_bloc">';
print '<ul class="menu">';
// Link to new sell
print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
print '<li class="menu_choix2"><a href="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>';
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
// Open new tab on backoffice (this is not a disconnect from POS)
print '<li class="menu_choix2"><a href=".." target="backoffice"><span>'.$langs->trans("BackOffice").'</span></a></li>';
// Disconnect
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'];
print ' <a href="deconnexion.php">'.$logout.'</a><br>';
print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
/*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';

3
htdocs/cashdesk/tpl/ticket.tpl.php
View File

@ -15,8 +15,7 @@ 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.
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html>
<head>

21
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -15,8 +15,7 @@ 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.
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
?>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
<?php
<?php
switch ($obj_facturation->mode_reglement())
{
{
case 'ESP':
echo $langs->trans("Cash");
$filtre='courant=2';
@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
echo $langs->trans("CreditCard");
$filtre='courant=1';
if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
break;
case 'CHQ':
echo $langs->trans("Cheque");
@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
echo $langs->trans("Reported");
$filtre='courant=1 OR courant=2';
$selected='';
break;
break;
default:
$filtre='courant=1 OR courant=2';
$selected='';
}
?>
</td></tr>
<?php
<?php
// Affichage des infos en fonction du mode de paiement
if ( $obj_facturation->mode_reglement() == 'DIF' ) {
@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<p class="note_label">
<?php
<?php
echo $langs->trans("BankToPay"). "<br>";
$html = new Form($db);
$html->select_comptes($selected,'cashdeskbank',0,$filtre);
$html->select_comptes($selected,'cashdeskbank',0,$filtre);
?>
</p>
<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>

3
htdocs/cashdesk/tpl/validation2.tpl.php
View File

@ -14,8 +14,7 @@ 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.
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3>

7
htdocs/categories/categorie.php
View File

@ -17,15 +17,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/categorie.php
* \ingroup category
* \brief Page to show category tab
* \version $Id$
* \version $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $
*/
require("../main.inc.php");
@ -535,5 +534,5 @@ function formCategory($db,$object,$typeid)
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $');
?>

5
htdocs/categories/class/categorie.class.php
View File

@ -17,15 +17,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/class/categorie.class.php
* \ingroup categorie
* \brief File of class to manage categories
* \version $Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $
* \version $Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");

7
htdocs/categories/docreate.php
View File

@ -13,17 +13,16 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
* $Id: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $
*/
/**
* \file htdocs/categories/docreate.php
* \ingroup category
* \brief Page de creation categorie
* \version $Revision$
* \version $Revision: 1.9 $
*/
require("../main.inc.php");

5
htdocs/categories/domodif.php
View File

@ -12,15 +12,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/categories/domodif.php
\ingroup category
\brief Page de modification categorie
\version $Revision$
\version $Revision: 1.6 $
*/
require("../main.inc.php");

7
htdocs/categories/edit.php
View File

@ -15,15 +15,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/edit.php
* \ingroup category
* \brief Page d'edition de categorie produit
* \version $Id$
* \version $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $
*/
require("../main.inc.php");
@ -152,5 +151,5 @@ print '</td></tr></table>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $');
?>

7
htdocs/categories/fiche.php
View File

@ -15,15 +15,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/fiche.php
* \ingroup category
* \brief Page to create a new category
* \version $Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $
* \version $Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $
*/
require("../main.inc.php");
@ -235,5 +234,5 @@ if ($user->rights->categorie->creer)
$db->close();
llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $');
llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $');
?>

7
htdocs/categories/index.php
View File

@ -16,15 +16,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/index.php
* \ingroup category
* \brief Home page of category area
* \version $Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $
* \version $Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $
*/
require("../main.inc.php");
@ -313,5 +312,5 @@ print "</table>";
$db->close();
llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $');
llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $');
?>

7
htdocs/categories/liste.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/liste.php
* \ingroup category
* \brief Page liste des categories
* \version $Id$
* \version $Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $
*/
require("../main.inc.php");
@ -77,5 +76,5 @@ print '</td></tr></table>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.10 $');
?>

7
htdocs/categories/photos.php
View File

@ -15,15 +15,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/photos.php
* \ingroup category
* \brief Gestion des photos d'une categorie
* \version $Id$
* \version $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $
*/
require("../main.inc.php");
@ -305,5 +304,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.13 $');
?>

7
htdocs/categories/viewcat.php
View File

@ -15,15 +15,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/categories/viewcat.php
* \ingroup category
* \brief Page to show a category card
* \version $Revision$
* \version $Revision: 1.53 $
*/
require("../main.inc.php");
@ -364,5 +363,5 @@ if ($object->type == 3)
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.53 $');
?>

5
htdocs/comm/action/class/actioncomm.class.php
View File

@ -15,15 +15,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/action/class/actioncomm.class.php
* \ingroup commercial
* \brief File of class to manage agenda events (actions)
* \version $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $
* \version $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php');

5
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/action/class/cactioncomm.class.php
* \ingroup commercial
* \brief File of class to manage type of agenda events
* \version $Id$
* \version $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $
*/

5
htdocs/comm/action/class/ical.class.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/action/class/ical.class.php
* \ingroup commercial
* \brief File of class to parse ical calendars
* \version $Id$
* \version $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $
*/
class ical
{

7
htdocs/comm/action/rapport/index.php
View File

@ -15,15 +15,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/action/rapport/index.php
* \ingroup commercial
* \brief Page with reports of actions
* \version $Id$
* \version $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $
*/
require("../../../main.inc.php");
@ -151,5 +150,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.48 $');
?>

7
htdocs/comm/addpropal.php
View File

@ -16,15 +16,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/addpropal.php
* \ingroup propal
* \brief Page to add a new commercial proposal
* \version $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $
* \version $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $
*/
require("../main.inc.php");
@ -339,5 +338,5 @@ if ($_GET["action"] == 'create')
$db->close();
llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $');
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $');
?>

7
htdocs/comm/address.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/address.php
* \ingroup societe
* \brief Onglet adresses d'un client
* \version $Id$
* \version $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $
*/
require("../main.inc.php");
@ -517,5 +516,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.9 $');
?>

7
htdocs/comm/bookmark.php
View File

@ -12,14 +12,13 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/comm/bookmark.php
\brief Page affichage des bookmarks
\version $Id$
\version $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $
*/
@ -147,5 +146,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.24 $');
?>

7
htdocs/comm/clients.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/clients.php
* \ingroup commercial, societe
* \brief List of customers
* \version $Id$
* \version $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $
*/
require("../main.inc.php");
@ -250,5 +249,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $');
?>

7
htdocs/comm/contact.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
\file htdocs/comm/contact.php
\ingroup commercial
\brief Liste des contacts
\version $Id$
\version $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $
*/
require("../main.inc.php");
@ -181,5 +180,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.50 $');
?>

7
htdocs/comm/fiche.php
View File

@ -18,15 +18,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/fiche.php
* \ingroup commercial, compta
* \brief Page to show customer card of a third party
* \version $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $
* \version $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $
*/
require("../main.inc.php");
@ -892,5 +891,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $');
llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $');
?>

7
htdocs/comm/index.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/index.php
* \ingroup commercial
* \brief Home page of commercial area
* \version $Id$
* \version $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $
*/
require("../main.inc.php");
@ -632,5 +631,5 @@ print '</table>';
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $');
?>

7
htdocs/comm/mailing/cibles.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/mailing/cibles.php
* \ingroup mailing
* \brief Page to define emailing targets
* \version $Id$
* \version $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $
*/
require("../../main.inc.php");
@ -515,5 +514,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.76 $');
?>

5
htdocs/comm/mailing/class/mailing.class.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/mailing/class/mailing.class.php
* \ingroup mailing
* \brief Fichier de la classe de gestion des mailings
* \version $Id$
* \version $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");

7
htdocs/comm/mailing/fiche.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/mailing/fiche.php
* \ingroup mailing
* \brief Fiche mailing, onglet general
* \version $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $
* \version $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $
*/
require("../../main.inc.php");
@ -1073,5 +1072,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/10 13:33:53 $ - $Revision: 1.122 $');
llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.123 $');
?>

7
htdocs/comm/mailing/index.php
View File

@ -14,15 +14,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/mailing/index.php
* \ingroup mailing
* \brief Page accueil de la zone mailing
* \version $Id$
* \version $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $
*/
require("../../main.inc.php");
@ -216,6 +215,6 @@ if ($langs->file_exists("html/spam.html",0)) {
}
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.37 $');
?>

7
htdocs/comm/mailing/info.php
View File

@ -13,15 +13,14 @@
* 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.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/mailing/info.php
* \ingroup mailing
* \brief Page with log information for emailing
* \version $Id$
* \version $Id: info.php,v 1.6 2011/08/03 00:46:33 eldy Exp $
*/
require("../../main.inc.php");
@ -67,5 +66,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.6 $');
?>

Some files were not shown because too many files have changed in this diff Show More