cvsimport
This commit is contained in:
Laurent Destailleur
commit
6ce0191b7c
@ -9,15 +9,12 @@ Build-Depends: debhelper (>= 7), po-debconf
|
||||
Package: dolibarr
|
||||
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
||||
php5-mysql | php5-mysqli,
|
||||
php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
|
||||
php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
|
||||
${misc:Depends}, xdg-utils,
|
||||
mysql-server, perl
|
||||
Recommends: apache2 | lighttpd | httpd, mysql-client
|
||||
Suggests: www-browser
|
||||
Architecture: all
|
||||
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
|
||||
|
||||
@ -6,4 +6,13 @@ embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckedit
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/extlib/Snoopy.class.inc
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/rss_parse.inc
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
|
||||
# embedded fonts, wich are specific to Dolibarr usage
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/Tuffy.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBold.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBoldItalic.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyItalic.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/Aerial.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBd.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBdIt.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialIt.ttf
|
||||
@ -1,6 +1,6 @@
|
||||
etc/dolibarr/apache.conf
|
||||
etc/dolibarr/lighttpd.conf
|
||||
usr/share/applications/dolibarr.desktop
|
||||
usr/share/doc/dolibarr
|
||||
usr/share/dolibarr
|
||||
usr/share/doc/dolibarr
|
||||
usr/share/pixmaps
|
||||
|
||||
@ -144,7 +144,7 @@ case "$1" in
|
||||
|
||||
|
||||
echo ----------
|
||||
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
|
||||
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the setup and use Dolibarr."
|
||||
echo ----------
|
||||
;;
|
||||
|
||||
|
||||
@ -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.121 2011/07/28 23:05:13 eldy Exp $
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.133 2011/08/03 21:46:02 eldy Exp $
|
||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -11,7 +11,7 @@ use Cwd;
|
||||
$PROJECT="dolibarr";
|
||||
$MAJOR="3";
|
||||
$MINOR="1";
|
||||
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||
$RPMSUBVERSION="auto"; # auto use value found into BUILD
|
||||
|
||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
||||
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$REVISION='$Revision: 1.133 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="1.0 (build $REVISION)";
|
||||
|
||||
|
||||
@ -254,15 +254,18 @@ if ($nboftargetok) {
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||
@ -273,9 +276,14 @@ if ($nboftargetok) {
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
|
||||
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
|
||||
@ -291,11 +299,6 @@ if ($nboftargetok) {
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
||||
@ -304,17 +307,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/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`;
|
||||
}
|
||||
|
||||
# Build package for each target
|
||||
@ -413,14 +422,19 @@ if ($nboftargetok) {
|
||||
}
|
||||
|
||||
if ($target eq 'RPM') { # Linux only
|
||||
$ARCH='i386';
|
||||
#$ARCH='i386';
|
||||
$ARCH='noarch';
|
||||
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
|
||||
$newbuild = $BUILD;
|
||||
$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||
$newbuild =~ s/beta/1/gi; # beta
|
||||
$newbuild =~ s/rc./2/gi; # rc
|
||||
# For fedora
|
||||
$newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev
|
||||
$newbuild =~ s/beta/0.2.beta1/gi; # beta
|
||||
$newbuild =~ s/rc./0.3.rc1/gi; # rc
|
||||
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||
# now newbuild is 0-0 or 0-3 for example
|
||||
#$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||
#$newbuild =~ s/beta/1/gi; # beta
|
||||
#$newbuild =~ s/rc./2/gi; # rc
|
||||
#if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
|
||||
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
|
||||
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
|
||||
@ -432,22 +446,108 @@ 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/usr/share\n";
|
||||
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share"`;
|
||||
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT\n";
|
||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT\"";
|
||||
$ret=`$cmd`;
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/ChangeLog`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/COPYING`;
|
||||
#$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/COPYRIGHT`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/INSTALL`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/README-FR`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/README-FR`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/dmg`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/pad/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/tgz/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/deb/README`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/doap`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/exe`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/live`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/patch`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/dbmodel`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/initdata`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/iso-normes`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/phpcheckstyle`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/phpunit`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/doc/flyer`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/doc/font`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/doc/tshirt`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/doc/rollup`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/test`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/fpdf/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/smarty`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/COPYING`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
|
||||
# To remove once stable
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||
|
||||
# Apache conf files
|
||||
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
|
||||
|
||||
# dolibarr.desktop
|
||||
#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
|
||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
|
||||
#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
|
||||
#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
|
||||
|
||||
# pixmap
|
||||
#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
|
||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
|
||||
#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
|
||||
#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
|
||||
|
||||
# Set owners
|
||||
print "Set owners on files/dir\n";
|
||||
$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
|
||||
|
||||
print "Set permissions on files/dir\n";
|
||||
$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/translation/langAutoParser.class.php`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/skeletons/skeleton_page.php`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/skeletons/modMyModule.class.php`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/skeletons/skeleton_class.class.php`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
|
||||
# Build tgz
|
||||
print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
|
||||
$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
|
||||
|
||||
@ -475,11 +575,17 @@ if ($nboftargetok) {
|
||||
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
|
||||
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
||||
$ret=`$cmd`;
|
||||
print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
|
||||
$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
|
||||
$ret=`$cmd`;
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
|
||||
if ($target eq 'DEB')
|
||||
{
|
||||
$olddir=getcwd();
|
||||
|
||||
$newbuild = $BUILD;
|
||||
$newbuild =~ s/(dev|alpha)/1/gi; # dev
|
||||
$newbuild =~ s/beta/2/gi; # beta
|
||||
@ -514,7 +620,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/;
|
||||
@ -525,20 +631,35 @@ if ($nboftargetok) {
|
||||
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/ChangeLog`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
|
||||
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
|
||||
@ -555,6 +676,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`;
|
||||
@ -569,19 +691,21 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
|
||||
# To remove once stable
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||
|
||||
# Apache conf files
|
||||
# Apache and lighttpd conf files
|
||||
print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
|
||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
|
||||
$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
|
||||
|
||||
# Dolibarr conf files
|
||||
# TODO
|
||||
print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n";
|
||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
|
||||
$ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`;
|
||||
|
||||
# dolibarr.desktop
|
||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
|
||||
@ -598,17 +722,10 @@ if ($nboftargetok) {
|
||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
|
||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
|
||||
|
||||
#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
||||
#$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
|
||||
|
||||
# copyright (to build binary package directly without sources. Useless if we build from sources)
|
||||
#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
|
||||
#$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
|
||||
|
||||
# changelog (to build binary package directly without sources. Useless if we build from sources)
|
||||
#$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
|
||||
#$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
|
||||
$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
|
||||
|
||||
# Set owners
|
||||
print "Set owners on files/dir\n";
|
||||
$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
|
||||
|
||||
@ -637,47 +754,45 @@ if ($nboftargetok) {
|
||||
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
|
||||
print "Go to directory $BUILDROOT\n";
|
||||
$olddir=getcwd();
|
||||
chdir("$BUILDROOT");
|
||||
|
||||
# Creation of binary package (to build without sources)
|
||||
# Creation of binary package (to build without sources)
|
||||
#print "Go to directory $BUILDROOT\n";
|
||||
#chdir("$BUILDROOT");
|
||||
#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
|
||||
#print "Launch DEB build ($cmd)\n";
|
||||
#$ret=`$cmd`;
|
||||
#print $ret."\n";
|
||||
|
||||
# Creation of source package
|
||||
# Prepare source package
|
||||
print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
|
||||
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||
# Add files for dpkg-source
|
||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
|
||||
# Add files also required to build binary package with dpkg-buildpackages
|
||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
|
||||
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||
$ret=`$cmd`;
|
||||
|
||||
# Creation of source package
|
||||
print "Go to directory $BUILDROOT\n";
|
||||
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
|
||||
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||
$cmd="dpkg-buildpackage -us -uc";
|
||||
@ -690,12 +805,18 @@ if ($nboftargetok) {
|
||||
if ($OS =~ /windows/i)
|
||||
{
|
||||
print "Move *_all.deb to $DESTI\n";
|
||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
||||
}
|
||||
else
|
||||
{
|
||||
print "Move *_all.deb to $DESTI\n";
|
||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
@ -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:
|
||||
#
|
||||
# To install all packagers tools:
|
||||
# yum -y install rpmlint mock 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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -5,24 +5,28 @@
|
||||
# file to build a package for your own distributions and
|
||||
# edit it if you need to match your rules.
|
||||
# --------------------------------------------------------
|
||||
|
||||
%define name dolibarr
|
||||
%define version __VERSION__
|
||||
%define version __VERSION__
|
||||
%define release __RELEASE__
|
||||
|
||||
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
|
||||
Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
|
||||
License: GPLv2+
|
||||
#Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
|
||||
Vendor: Dolibarr dev team
|
||||
|
||||
URL: http://www.%{name}.org
|
||||
Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
|
||||
Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz
|
||||
BuildArch: noarch
|
||||
#BuildArchitectures: noarch
|
||||
BuildRoot: /tmp/%{name}-buildroot
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#Icon: dolibarr_logo1.gif
|
||||
|
||||
# For Mandriva-Mageia
|
||||
@ -30,9 +34,6 @@ Group: Networking/WWW
|
||||
# For all other distrib
|
||||
Group: Applications/Internet
|
||||
|
||||
# Requires can use lua to be defined dynamically (but still at build time)
|
||||
# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end }
|
||||
|
||||
# Requires for Fedora-Redhat
|
||||
Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql
|
||||
# Requires for OpenSuse
|
||||
@ -56,27 +57,26 @@ 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,
|
||||
artisans ou associations. Il permet de gérer vos clients, prospect,
|
||||
fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
|
||||
fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings
|
||||
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,71 +94,67 @@ 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 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
|
||||
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
|
||||
%{__install} -m 644 usr/share/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/usr/share/dolibarr/build
|
||||
%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
|
||||
%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
|
||||
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr
|
||||
%{__cp} -pr usr/share/dolibarr/build $RPM_BUILD_ROOT/usr/share/dolibarr
|
||||
%{__cp} -pr usr/share/dolibarr/htdocs $RPM_BUILD_ROOT/usr/share/dolibarr
|
||||
%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr
|
||||
%{__cp} -pr usr/share/dolibarr/doc/* $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr
|
||||
%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr/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/*
|
||||
%doc %{_datadir}/doc/dolibarr/*
|
||||
%dir /usr/share/dolibarr/build
|
||||
%dir /usr/share/dolibarr/htdocs
|
||||
%dir /usr/share/dolibarr/scripts
|
||||
%_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
|
||||
/usr/share/dolibarr/build/*
|
||||
/usr/share/dolibarr/htdocs/*
|
||||
/usr/share/dolibarr/scripts/*
|
||||
|
||||
%defattr(0664, -, -, 0755)
|
||||
%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
|
||||
%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
|
||||
|
||||
|
||||
#---- post (after unzip during install)
|
||||
%post
|
||||
#%update_menus # Does not exists on fedora nor mandriva
|
||||
|
||||
|
||||
# Define vars
|
||||
# Dolibarr files are stored into /var/www
|
||||
export targetdir='/var/www/dolibarr'
|
||||
# Dolibarr files are stored into /usr/share
|
||||
export targetdir='/usr/share/dolibarr'
|
||||
# Dolibarr uploaded files and generated documents will be stored into docdir
|
||||
#export docdir="/var/lib/dolibarr/documents"
|
||||
export docdir="/usr/share/dolibarr/documents"
|
||||
export docdir="/var/lib/dolibarr/documents"
|
||||
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 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 +188,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,36 +201,34 @@ 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 ]
|
||||
then
|
||||
echo Create empty file $config
|
||||
touch $config
|
||||
chown -R root:$apachegroup $config
|
||||
chmod -R 660 $config
|
||||
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
|
||||
then
|
||||
echo Create empty file $config
|
||||
touch $config
|
||||
%{__chown} -R root:$apachegroup $config
|
||||
%{__chmod} -R 660 $config
|
||||
fi
|
||||
|
||||
# Create config file for se $seconfig
|
||||
if [ ! -f $seconfig ]; then
|
||||
echo Create se config file $seconfig
|
||||
cp $sefileorig $seconfig
|
||||
# chmod a-x $apacheconfig
|
||||
# chmod go-w $apacheconfig
|
||||
if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
|
||||
echo Add SE Linux permissions for dolibarr
|
||||
# semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
|
||||
semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
|
||||
#semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)"
|
||||
semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr/install.lock"
|
||||
semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
|
||||
restorecon -R -v /etc/dolibarr
|
||||
#restorecon -R -v /usr/share/dolibarr
|
||||
restorecon -v /usr/share/dolibarr/install.lock
|
||||
restorecon -R -v /var/lib/dolibarr
|
||||
fi
|
||||
|
||||
# Create a config link dolibarr.conf
|
||||
@ -245,25 +239,13 @@ fi
|
||||
|
||||
# Set permissions
|
||||
echo Set permission to $apacheuser:$apachegroup on $targetdir
|
||||
chown -R $apacheuser:$apachegroup $targetdir
|
||||
chmod -R a-w $targetdir
|
||||
chmod u+w $targetdir
|
||||
%{__chown} -R $apacheuser:$apachegroup $targetdir
|
||||
%{__chmod} -R a-w $targetdir
|
||||
%{__chmod} u+w $targetdir
|
||||
|
||||
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
|
||||
echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
|
||||
%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr
|
||||
%{__chmod} -R o-w /var/lib/dolibarr
|
||||
|
||||
# Restart web server
|
||||
echo Restart web server
|
||||
@ -274,10 +256,16 @@ 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 -----"
|
||||
echo "Dolibarr files are now installed (into /var/www/dolibarr)."
|
||||
echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
|
||||
echo "To finish installation and use Dolibarr, click on ne menu"
|
||||
echo "entry Dolibarr ERP-CRM or call the following page from your"
|
||||
echo "web browser:"
|
||||
@ -288,22 +276,19 @@ echo
|
||||
|
||||
#---- postun (after uninstall)
|
||||
%postun
|
||||
#%clean_menus # Does not exists on fedora nor mandriva
|
||||
|
||||
|
||||
# Define vars
|
||||
# Dolibarr files are stored into targetdir
|
||||
export targetdir='/var/www/dolibarr'
|
||||
export targetdir='/usr/share/dolibarr'
|
||||
# Dolibarr uploaded files and generated documents will be stored into docdir
|
||||
#export docdir="/var/lib/dolibarr/documents"
|
||||
export docdir="/usr/share/dolibarr/documents"
|
||||
export docdir="/var/lib/dolibarr/documents"
|
||||
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 +323,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 +341,13 @@ 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
|
||||
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
|
||||
%{__rm} -f $lockfile
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
/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
|
||||
# This file is useless.
|
||||
# It is provided as example to know contexts modified by installer
|
||||
# to make Dolibarr working.
|
||||
/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
|
||||
/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
|
||||
/var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0
|
||||
@ -1,7 +1,7 @@
|
||||
# Apache config file for Dolibarr
|
||||
|
||||
<IfModule mod_alias.c>
|
||||
Alias /dolibarr /var/www/dolibarr/htdocs
|
||||
Alias /dolibarr /usr/share/dolibarr/htdocs
|
||||
</IfModule>
|
||||
|
||||
# You can also use dolibarr as a VirtualHost
|
||||
@ -14,7 +14,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs
|
||||
# </VirtualHost>
|
||||
|
||||
# Directory for web pages
|
||||
<DirectoryMatch /var/www/dolibarr>
|
||||
<DirectoryMatch /usr/share/dolibarr>
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
DirectoryIndex index.php
|
||||
@ -59,7 +59,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs
|
||||
</DirectoryMatch>
|
||||
|
||||
# Directory for public pages
|
||||
<DirectoryMatch /var/www/dolibarr/public>
|
||||
<DirectoryMatch /usr/share/dolibarr/public>
|
||||
AllowOverride All
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
@ -78,7 +78,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
</DirectoryMatch>
|
||||
<DirectoryMatch /var/www/dolibarr/documents>
|
||||
<DirectoryMatch /var/lib/dolibarr/documents>
|
||||
AllowOverride All
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
$force_install_noedit=2;
|
||||
$force_install_message='KeepDefaultValuesDeb';
|
||||
$force_install_main_data_root='/usr/share/dolibarr/documents';
|
||||
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
||||
$force_install_type='mysqli';
|
||||
$force_install_dbserver='localhost';
|
||||
$force_install_port='3306';
|
||||
|
||||
BIN
dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
Executable file
BIN
dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
Executable file
Binary file not shown.
@ -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/proxy.php
|
||||
* \ingroup core
|
||||
* \brief Page setup proxy to use for external web access
|
||||
* \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
|
||||
* \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg);
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
|
||||
?>
|
||||
|
||||
@ -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/security_other.php
|
||||
* \ingroup core
|
||||
* \brief Security options setup
|
||||
* \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
|
||||
* \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
|
||||
?>
|
||||
|
||||
@ -11,7 +11,7 @@ require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
|
||||
?>
|
||||
|
||||
<!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
|
||||
|
||||
Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
@ -82,7 +82,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
for($i=0;$i < $tab_size;$i++) {
|
||||
|
||||
echo ('<div class="cadre_article">'."\n");
|
||||
echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="Cliquez pour enlever cet article">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
|
||||
echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="'.$langs->trans("DeleteArticle").'">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
|
||||
|
||||
if ( $tab[$i]['remise_percent'] > 0 ) {
|
||||
|
||||
|
||||
@ -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>';
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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/>.
|
||||
*/
|
||||
|
||||
require('../main.inc.php');
|
||||
|
||||
@ -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/compta/bank/bankid_fr.php
|
||||
* \ingroup banque
|
||||
* \brief Fiche creation compte bancaire
|
||||
* \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
|
||||
?>
|
||||
|
||||
@ -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/compta/bank/fiche.php
|
||||
* \ingroup banque
|
||||
* \brief Page to create/view a bank account
|
||||
* \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
@ -608,5 +607,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
|
||||
?>
|
||||
|
||||
@ -15,14 +15,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/compta/prelevement/create.php
|
||||
* \brief Prelevement
|
||||
* \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
|
||||
* \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../bank/pre.inc.php");
|
||||
@ -276,5 +275,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
|
||||
?>
|
||||
|
||||
@ -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/core/class/cookie.class.php
|
||||
* \ingroup core
|
||||
* \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
|
||||
* \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
|
||||
* \brief File of class to manage cookies
|
||||
*/
|
||||
|
||||
|
||||
@ -20,15 +20,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/filefunc.inc.php
|
||||
* \ingroup core
|
||||
* \brief File that include conf.php file and functions.lib.php
|
||||
* \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
|
||||
* \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php";
|
||||
# Define localization of conf file
|
||||
$conffile = "conf/conf.php";
|
||||
$conffiletoshow = "htdocs/conf/conf.php";
|
||||
# For debian like systems
|
||||
# For debian/redhat like systems
|
||||
#$conffile = "/etc/dolibarr/conf.php";
|
||||
#$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||
|
||||
|
||||
@ -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/imports/import.php
|
||||
* \ingroup import
|
||||
* \brief Pages of import Wizard
|
||||
* \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
|
||||
* \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $
|
||||
*/
|
||||
|
||||
require_once("../main.inc.php");
|
||||
@ -1669,7 +1668,7 @@ print '<br>';
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
|
||||
llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $');
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
$Id$
|
||||
$Id: class.nusoap_base.php,v 1.7 2011/08/03 16:46:46 eldy Exp $
|
||||
|
||||
NuSOAP - Web Services Toolkit for PHP
|
||||
|
||||
@ -18,8 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; 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/>.
|
||||
|
||||
The NuSOAP project home is:
|
||||
http://sourceforge.net/projects/nusoap/
|
||||
@ -79,7 +78,7 @@ $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = 9;
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: class.nusoap_base.php,v 1.7 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_base {
|
||||
@ -103,7 +102,7 @@ class nusoap_base {
|
||||
* @var string
|
||||
* @access private
|
||||
*/
|
||||
var $revision = '$Revision$';
|
||||
var $revision = '$Revision: 1.7 $';
|
||||
/**
|
||||
* Current error string (manipulated by getError/setError)
|
||||
*
|
||||
@ -141,7 +140,7 @@ class nusoap_base {
|
||||
* @access public
|
||||
*/
|
||||
var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
|
||||
|
||||
|
||||
/**
|
||||
* charset encoding for outgoing messages
|
||||
*
|
||||
@ -408,7 +407,7 @@ class nusoap_base {
|
||||
$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
|
||||
$this->appendDebug('value=' . $this->varDump($val));
|
||||
$this->appendDebug('attributes=' . $this->varDump($attributes));
|
||||
|
||||
|
||||
if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
|
||||
$this->debug("serialize_val: serialize soapval");
|
||||
$xml = $val->serialize($use);
|
||||
@ -982,7 +981,7 @@ function iso8601_to_timestamp($datestr){
|
||||
function usleepWindows($usec)
|
||||
{
|
||||
$start = gettimeofday();
|
||||
|
||||
|
||||
do
|
||||
{
|
||||
$stop = gettimeofday();
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
$Id$
|
||||
$Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
|
||||
NuSOAP - Web Services Toolkit for PHP
|
||||
|
||||
@ -18,8 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; 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/>.
|
||||
|
||||
The NuSOAP project home is:
|
||||
http://sourceforge.net/projects/nusoap/
|
||||
@ -79,7 +78,7 @@ $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = 9;
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_base {
|
||||
@ -103,7 +102,7 @@ class nusoap_base {
|
||||
* @var string
|
||||
* @access private
|
||||
*/
|
||||
var $revision = '$Revision$';
|
||||
var $revision = '$Revision: 1.15 $';
|
||||
/**
|
||||
* Current error string (manipulated by getError/setError)
|
||||
*
|
||||
@ -1004,7 +1003,7 @@ function usleepWindows($usec)
|
||||
* Mainly used for returning faults from deployed functions
|
||||
* in a server instance.
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_fault extends nusoap_base {
|
||||
@ -1092,7 +1091,7 @@ class soap_fault extends nusoap_fault {
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_xmlschema extends nusoap_base {
|
||||
@ -2064,7 +2063,7 @@ class XMLSchema extends nusoap_xmlschema {
|
||||
* xsd:anyType and user-defined types.
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class soapval extends nusoap_base {
|
||||
@ -2166,7 +2165,7 @@ class soapval extends nusoap_base {
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class soap_transport_http extends nusoap_base {
|
||||
@ -3471,7 +3470,7 @@ class soap_transport_http extends nusoap_base {
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_server extends nusoap_base {
|
||||
@ -4594,7 +4593,7 @@ class soap_server extends nusoap_server {
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class wsdl extends nusoap_base {
|
||||
@ -6532,7 +6531,7 @@ class wsdl extends nusoap_base {
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_parser extends nusoap_base {
|
||||
@ -7183,7 +7182,7 @@ class soap_parser extends nusoap_parser {
|
||||
*
|
||||
* @author Dietrich Ayala <dietrich@ganx4.com>
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @version $Id$
|
||||
* @version $Id: nusoap.php,v 1.15 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_client extends nusoap_base {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/*
|
||||
$Id$
|
||||
$Id: nusoapmime.php,v 1.9 2011/08/03 16:46:46 eldy Exp $
|
||||
|
||||
NuSOAP - Web Services Toolkit for PHP
|
||||
|
||||
@ -17,8 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; 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/>.
|
||||
|
||||
The NuSOAP project home is:
|
||||
http://sourceforge.net/projects/nusoap/
|
||||
@ -48,7 +47,7 @@ require_once('Mail/mimePart.php');
|
||||
*
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @author Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
|
||||
* @version $Id$
|
||||
* @version $Id: nusoapmime.php,v 1.9 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_client_mime extends nusoap_client {
|
||||
@ -69,7 +68,7 @@ class nusoap_client_mime extends nusoap_client {
|
||||
* @access private
|
||||
*/
|
||||
var $mimeContentType;
|
||||
|
||||
|
||||
/**
|
||||
* adds a MIME attachment to the current request.
|
||||
*
|
||||
@ -94,7 +93,7 @@ class nusoap_client_mime extends nusoap_client {
|
||||
$info['filename'] = $filename;
|
||||
$info['contenttype'] = $contenttype;
|
||||
$info['cid'] = $cid;
|
||||
|
||||
|
||||
$this->requestAttachments[] = $info;
|
||||
|
||||
return $cid;
|
||||
@ -140,7 +139,7 @@ class nusoap_client_mime extends nusoap_client {
|
||||
$params['encoding'] = '8bit';
|
||||
$params['charset'] = $this->soap_defencoding;
|
||||
$mimeMessage->addSubpart($soapmsg, $params);
|
||||
|
||||
|
||||
foreach ($this->requestAttachments as $att) {
|
||||
unset($params);
|
||||
|
||||
@ -165,7 +164,7 @@ class nusoap_client_mime extends nusoap_client {
|
||||
|
||||
$output = $mimeMessage->encode();
|
||||
$mimeHeaders = $output['headers'];
|
||||
|
||||
|
||||
foreach ($mimeHeaders as $k => $v) {
|
||||
$this->debug("MIME header $k: $v");
|
||||
if (strtolower($k) == 'content-type') {
|
||||
@ -174,13 +173,13 @@ class nusoap_client_mime extends nusoap_client {
|
||||
$this->mimeContentType = str_replace("\r\n", " ", $v);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $output['body'];
|
||||
}
|
||||
|
||||
return parent::getHTTPBody($soapmsg);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* gets the HTTP content type for the current request.
|
||||
*
|
||||
@ -195,7 +194,7 @@ class nusoap_client_mime extends nusoap_client {
|
||||
}
|
||||
return parent::getHTTPContentType();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* gets the HTTP content type charset for the current request.
|
||||
* returns false for non-text content types.
|
||||
@ -233,7 +232,7 @@ class nusoap_client_mime extends nusoap_client {
|
||||
$params['include_bodies'] = true;
|
||||
$params['decode_bodies'] = true;
|
||||
$params['decode_headers'] = true;
|
||||
|
||||
|
||||
$structure = Mail_mimeDecode::decode($params);
|
||||
|
||||
foreach ($structure->parts as $part) {
|
||||
@ -250,12 +249,12 @@ class nusoap_client_mime extends nusoap_client {
|
||||
$this->responseAttachments[] = $info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (isset($return)) {
|
||||
$this->responseData = $root;
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
||||
$this->setError('No root part found in multipart/related content');
|
||||
return '';
|
||||
}
|
||||
@ -278,7 +277,7 @@ if (!extension_loaded('soap')) {
|
||||
*
|
||||
* @author Scott Nichol <snichol@users.sourceforge.net>
|
||||
* @author Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
|
||||
* @version $Id$
|
||||
* @version $Id: nusoapmime.php,v 1.9 2011/08/03 16:46:46 eldy Exp $
|
||||
* @access public
|
||||
*/
|
||||
class nusoap_server_mime extends nusoap_server {
|
||||
@ -299,7 +298,7 @@ class nusoap_server_mime extends nusoap_server {
|
||||
* @access private
|
||||
*/
|
||||
var $mimeContentType;
|
||||
|
||||
|
||||
/**
|
||||
* adds a MIME attachment to the current response.
|
||||
*
|
||||
@ -324,7 +323,7 @@ class nusoap_server_mime extends nusoap_server {
|
||||
$info['filename'] = $filename;
|
||||
$info['contenttype'] = $contenttype;
|
||||
$info['cid'] = $cid;
|
||||
|
||||
|
||||
$this->responseAttachments[] = $info;
|
||||
|
||||
return $cid;
|
||||
@ -370,7 +369,7 @@ class nusoap_server_mime extends nusoap_server {
|
||||
$params['encoding'] = '8bit';
|
||||
$params['charset'] = $this->soap_defencoding;
|
||||
$mimeMessage->addSubpart($soapmsg, $params);
|
||||
|
||||
|
||||
foreach ($this->responseAttachments as $att) {
|
||||
unset($params);
|
||||
|
||||
@ -395,7 +394,7 @@ class nusoap_server_mime extends nusoap_server {
|
||||
|
||||
$output = $mimeMessage->encode();
|
||||
$mimeHeaders = $output['headers'];
|
||||
|
||||
|
||||
foreach ($mimeHeaders as $k => $v) {
|
||||
$this->debug("MIME header $k: $v");
|
||||
if (strtolower($k) == 'content-type') {
|
||||
@ -404,13 +403,13 @@ class nusoap_server_mime extends nusoap_server {
|
||||
$this->mimeContentType = str_replace("\r\n", " ", $v);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $output['body'];
|
||||
}
|
||||
|
||||
return parent::getHTTPBody($soapmsg);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* gets the HTTP content type for the current response.
|
||||
*
|
||||
@ -425,7 +424,7 @@ class nusoap_server_mime extends nusoap_server {
|
||||
}
|
||||
return parent::getHTTPContentType();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* gets the HTTP content type charset for the current response.
|
||||
* returns false for non-text content types.
|
||||
@ -463,7 +462,7 @@ class nusoap_server_mime extends nusoap_server {
|
||||
$params['include_bodies'] = true;
|
||||
$params['decode_bodies'] = true;
|
||||
$params['decode_headers'] = true;
|
||||
|
||||
|
||||
$structure = Mail_mimeDecode::decode($params);
|
||||
|
||||
foreach ($structure->parts as $part) {
|
||||
@ -479,11 +478,11 @@ class nusoap_server_mime extends nusoap_server {
|
||||
$this->requestAttachments[] = $info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (isset($return)) {
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
||||
$this->setError('No root part found in multipart/related content');
|
||||
return;
|
||||
}
|
||||
|
||||
@ -14,14 +14,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/index.php
|
||||
* \brief Dolibarr home page
|
||||
* \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
|
||||
* \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $
|
||||
*/
|
||||
|
||||
define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site.
|
||||
@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
|
||||
llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $');
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -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/install/check.php
|
||||
* \ingroup install
|
||||
* \brief Test if file conf can be modified and if does not exists, test if install process can create it
|
||||
* \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $
|
||||
*/
|
||||
include_once("./inc.php");
|
||||
|
||||
|
||||
@ -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/install/etape0.php
|
||||
* \ingroup install
|
||||
* \brief Show and ask charset for database
|
||||
* \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
|
||||
|
||||
@ -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/install/etape1.php
|
||||
* \ingroup install
|
||||
* \brief Build conf file on disk
|
||||
* \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
|
||||
* \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
|
||||
|
||||
@ -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/install/etape2.php
|
||||
* \ingroup install
|
||||
* \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
|
||||
* \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $
|
||||
*/
|
||||
|
||||
include("./inc.php");
|
||||
|
||||
@ -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/install/etape4.php
|
||||
* \ingroup install
|
||||
* \brief Ask login and password of Dolibarr admin user
|
||||
* \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@ -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/install/etape5.php
|
||||
* \ingroup install
|
||||
* \brief Last page of upgrade or install process
|
||||
* \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
|
||||
* \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $
|
||||
*/
|
||||
|
||||
include_once("./inc.php");
|
||||
|
||||
@ -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/install/fileconf.php
|
||||
* \ingroup install
|
||||
* \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
|
||||
* \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $
|
||||
*/
|
||||
include_once("./inc.php");
|
||||
|
||||
|
||||
@ -15,14 +15,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/install/inc.php
|
||||
* \ingroup core
|
||||
* \brief File that define environment for install pages
|
||||
* \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
|
||||
* \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php";
|
||||
# Define localization of conf file
|
||||
$conffile = "../conf/conf.php";
|
||||
$conffiletoshow = "htdocs/conf/conf.php";
|
||||
# For debian like systems
|
||||
$lockfile = '../../install.lock';
|
||||
# For debian/redhat like systems
|
||||
#$conffile = "/etc/dolibarr/conf.php";
|
||||
#$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||
|
||||
#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here
|
||||
$lockfile = '../../install.lock';
|
||||
|
||||
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
||||
{
|
||||
@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
|
||||
}
|
||||
exit;
|
||||
}
|
||||
if (file_exists('../../install.lock'))
|
||||
if (file_exists($lockfile))
|
||||
{
|
||||
print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>';
|
||||
if (! empty($dolibarr_main_url_root))
|
||||
|
||||
@ -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/install/licence.php
|
||||
* \ingroup install
|
||||
* \brief Page to show licence (Removed from install process to save time)
|
||||
* \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
|
||||
* \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $
|
||||
*/
|
||||
|
||||
include_once("./inc.php");
|
||||
|
||||
@ -18,10 +18,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: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -158,21 +157,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
|
||||
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
||||
|
||||
-- Regions Chile (id country=67)
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||
|
||||
-- Regions San Salvador (id country=86)
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
||||
|
||||
@ -18,10 +18,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: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -566,7 +565,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
||||
|
||||
@ -17,10 +17,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: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
|
||||
@ -18,10 +18,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: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.85 2011/08/03 10:55:39 simnandez Exp $
|
||||
--
|
||||
-- Be carefull to requests order.
|
||||
-- This file must be loaded by calling /install/index.php page
|
||||
@ -300,7 +300,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
||||
|
||||
@ -13,10 +13,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: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $
|
||||
-- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_departements
|
||||
|
||||
@ -13,10 +13,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: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $
|
||||
-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_regions
|
||||
|
||||
@ -14,10 +14,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: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $
|
||||
-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $
|
||||
-- ===================================================================
|
||||
|
||||
create table llx_commande
|
||||
|
||||
@ -14,10 +14,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: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $
|
||||
-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $
|
||||
-- ===================================================================
|
||||
|
||||
create table llx_commande_fournisseur
|
||||
|
||||
@ -14,10 +14,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: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $
|
||||
-- $Id: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $
|
||||
-- ============================================================================
|
||||
|
||||
|
||||
|
||||
@ -34,4 +34,5 @@ CalTip=Feu clic per veure el calendari
|
||||
CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem
|
||||
BankToPay=Compte de cobrament
|
||||
ShowCompany=Veure empresa
|
||||
ShowStock=Veure magatzem
|
||||
ShowStock=Veure magatzem
|
||||
DeleteArticle=Feu clic per treure aquest article
|
||||
@ -34,4 +34,5 @@ CalTip=Click to view the calendar
|
||||
CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
|
||||
BankToPay=Charge Account
|
||||
ShowCompany=Show company
|
||||
ShowStock=Show warehouse
|
||||
ShowStock=Show warehouse
|
||||
DeleteArticle=Click to remove this article
|
||||
@ -34,4 +34,5 @@ CalTip=Haga clic para ver el calendario
|
||||
CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
|
||||
BankToPay=Cuenta de cobro
|
||||
ShowCompany=Ver empresa
|
||||
ShowStock=Ver almacén
|
||||
ShowStock=Ver almacén
|
||||
DeleteArticle=Haga clic para quitar este artículo
|
||||
@ -34,4 +34,5 @@ CalTip=Cliquez pour afficher le calendrier
|
||||
CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
|
||||
BankToPay=Compte à créditer
|
||||
ShowCompany=Voir société
|
||||
ShowStock=Voir entrepôt
|
||||
ShowStock=Voir entrepôt
|
||||
DeleteArticle=Cliquez pour enlever cet article
|
||||
@ -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/>.
|
||||
* or see http://www.gnu.org/
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/lib/ajax.lib.php
|
||||
* \brief Page called by Ajax request for produts
|
||||
* \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $
|
||||
* \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@ -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/main.inc.php
|
||||
* \ingroup core
|
||||
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
|
||||
* \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $
|
||||
* \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $
|
||||
*/
|
||||
|
||||
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
|
||||
|
||||
@ -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/product/class/product.class.php
|
||||
* \ingroup produit
|
||||
* \brief Fichier de la classe des produits predefinis
|
||||
* \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $
|
||||
*/
|
||||
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
||||
|
||||
|
||||
@ -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/product/fiche.php
|
||||
* \ingroup product
|
||||
* \brief Page to show product
|
||||
* \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status)
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $');
|
||||
llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $');
|
||||
|
||||
?>
|
||||
|
||||
@ -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/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* \files htdocs/societe/class/companybankaccount.class.php
|
||||
* \ingroup societe
|
||||
* \brief File of class to manage bank accounts description of third parties
|
||||
* \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $
|
||||
*/
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php");
|
||||
|
||||
@ -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/societe/rib.php
|
||||
* \ingroup societe
|
||||
* \brief BAN tab for companies
|
||||
* \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $
|
||||
* \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $');
|
||||
llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $');
|
||||
?>
|
||||
|
||||
@ -14,14 +14,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/theme/auguria/style.css.php
|
||||
* \brief Fichier de style CSS du theme auguria
|
||||
* \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $
|
||||
* \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $
|
||||
*/
|
||||
|
||||
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
|
||||
|
||||
Loading…
Reference in New Issue
Block a user