diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..bdeb2f85951 100644 --- a/build/deb/README +++ b/build/deb/README @@ -7,18 +7,9 @@ This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, with format .DEB (for Debian, Ubuntu, ...). -# To build a debian package, you need first -# apt-get -i debhelper -# apt-get -i dpkg-source -# apt-get -i gpg - # This is standard command to work on Debian packaging: # -# gpg --gen-key Generate a GPG key -# -# debconf-updatepo To run into po dir to regenate templates.pot -# # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages @@ -29,8 +20,6 @@ with format .DEB (for Debian, Ubuntu, ...). # # dpkg -L packagename List content of installed package # dpkg --purge Remove config files and interactive saved answers -# -# dpkg-buildpackage -us -uc Build a source and binary package To submit a package to Debian: @@ -47,7 +36,3 @@ For first ITP submission of Dolibarr, bug id was 634783. - Add a line for upstream into file changelog with bug number - Call for a mentor on ML debian-mentors to upload packages - -- Once package is uploaded, following URL are available: -http://packages.qa.debian.org/package.html -http://bugs.debian.org/package diff --git a/build/deb/control b/build/deb/control new file mode 100644 index 00000000000..0c35d38d224 --- /dev/null +++ b/build/deb/control @@ -0,0 +1,48 @@ +Package: dolibarr +Version: __VERSION__ +Architecture: all +Maintainer: Laurent Destailleur +Installed-Size: 61200 +Depends: debconf, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Section: web +Priority: optional +Recommends: firefox +Homepage: http://www.dolibarr.org +Description: Easy to use web based ERP & CRM software + Dolibarr ERP & CRM is an easy to use open source/free software for small + and medium companies, foundations or freelances. It includes different + features for Enterprise Resource Planning (ERP) and Customer Relationship + Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. + Dolibarr was designed to provide only features you need and be easy to use. + . + Only features you need are visible, depending on which module were activated. + Most common used modules are: + . + Customers, Suppliers or Prospects directory + Contacts directory + Orders management + Commercial proposals management + Invoices management + Products and services catalog + Stock management + Foundations members management + Bank accounts management + Point of Sale + Payments management + Commercial actions management + Contracts management + Standing orders management + Shipping management + Donations management + Bookmarks management + Mass Emailings + Reports + Data export and import tools + LDAP connectivity + PDF exports + And a lot of more modules... + . + You can also add third parties external modules or develop yours. + \ No newline at end of file diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..ec209a86deb 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations # Command to open an URL # For Fedora: xdg-open -# For Debian/Ubuntu: xdg-open or x-www-browser +# For Debian/Ubuntu: x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) -Exec=xdg-open http://localhost/dolibarr +Exec=x-www-browser http://localhost/dolibarr Icon=dolibarr Terminal=false Type=Application diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..1903003a9f4 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,7 +1,7 @@ Template: dolibarr/postrm Type: boolean Default: true -_Description: Delete database and uploaded files ? - Answer if you want to removed the Dolibarr MySQL database and all other - datas (datas related to this question are the Dolibarr DBMS account, all - Dolibarr tables, and all uploaded files). +Description: Delete database ? + Answer if you want to removed the Dolibarr MySQL database and all + its datas (datas related to this quetion are the Dolibarr DBMS account + and all Dolibarr tables). diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index ae04a704e10..6a2141bfee8 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.112 2011/07/21 22:11:30 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # 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 @@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot"; $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION"; -$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}"; +$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD"; if (-d "/usr/src/redhat") { @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.112 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -248,22 +248,16 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`; $ret=`rm -fr $BUILDROOT/$PROJECT/.project`; $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`; - $ret=`rm -fr $BUILDROOT/$PROJECT/pom.xml`; - $ret=`rm -fr $BUILDROOT/$PROJECT/default.properties`; $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; $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_*.deb`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; $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`; @@ -272,41 +266,25 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/AerialMono*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Tymes*.ttf`; $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/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`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`; - $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`; - $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`; $ret=`rm -fr $BUILDROOT/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`; $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/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$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`; @@ -414,19 +392,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # 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 + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -444,16 +417,6 @@ if ($nboftargetok) { print "Remove other files\n"; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`; - $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`; print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -482,10 +445,6 @@ 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; } @@ -498,12 +457,9 @@ if ($nboftargetok) { if ($newbuild !~ /-/) { $newbuild.='-4'; } # finale # now newbuild is 0-1 or 0-4 for example print "Version is $MAJOR.$MINOR.$newbuild\n"; - $build = $newbuild; - $build =~ s/-.*$//g; - # now build is 0 for example - - print "Remove target ${FILENAMEDEB}_all.deb...\n"; - unlink("$DESTI/${FILENAMEDEB}_all.deb"); + + print "Remove target $FILENAMEDEB.deb...\n"; + unlink("$DESTI/$FILENAMEDEB.deb"); #rmdir "$BUILDROOT/$PROJECT.tmp"; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; @@ -512,73 +468,31 @@ if ($nboftargetok) { print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\""; $ret=`$cmd`; - - # Create DEBIAN directory print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; - $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 -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $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 (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; - while () { - $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; - print SPECTO $_; - } - close SPECFROM; - close SPECTO; - print "Version set to $MAJOR.$MINOR.$newbuild\n"; - + print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + $ret=`cp -r "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -r "$SOURCE/build/deb/control" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -r "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -r "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + print "Remove other files\n"; - $ret=`rm -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/control`; $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`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`; $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 -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/uml`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/xdebug`; $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`; @@ -599,14 +513,17 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Apache 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 "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; + open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error"; + open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; + while () { + $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; + print SPECTO $_; + } + close SPECFROM; + close SPECTO; + print "Version set to $MAJOR.$MINOR.$newbuild\n"; + # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`; @@ -622,16 +539,15 @@ 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"`; + 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"`; + 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`; + # copyright + $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`; print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -665,63 +581,21 @@ if ($nboftargetok) { $olddir=getcwd(); chdir("$BUILDROOT"); - # Creation of binary package (to build without sources) - #$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 - 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/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=`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"`; - - $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; - $ret=`$cmd`; - chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); - #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; - $cmd="dpkg-buildpackage -us -uc"; - print "Launch DEB build ($cmd)\n"; - $ret=`$cmd`; - print $ret."\n"; - + $cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb"; + print "Launch DEB build ($cmd)\n"; + $ret=`$cmd`; + print $ret."\n"; chdir("$olddir"); if ($OS =~ /windows/i) { - print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n"; + $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`; } else { - print "Move *_all.deb to $DESTI\n"; - $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; - $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; + print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n"; + $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`; } next; } @@ -749,21 +623,14 @@ if ($nboftargetok) { $ret=`$cmd`; print "Remove other files\n"; - $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/rpm`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/dbmodel`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/fpdf`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/initdata`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/uml`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/xdebug`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/tshirt`; diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/adherents/cartes/index.php b/htdocs/adherents/cartes/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/adherents/cartes/index.php +++ b/htdocs/adherents/cartes/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/asterisk/index.php b/htdocs/asterisk/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/asterisk/index.php +++ b/htdocs/asterisk/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/bookmarks/index.php b/htdocs/bookmarks/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/bookmarks/index.php +++ b/htdocs/bookmarks/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cashdesk/class/index.php b/htdocs/cashdesk/class/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cashdesk/class/index.php +++ b/htdocs/cashdesk/class/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cashdesk/img/index.php b/htdocs/cashdesk/img/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cashdesk/img/index.php +++ b/htdocs/cashdesk/img/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cashdesk/include/index.php b/htdocs/cashdesk/include/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cashdesk/include/index.php +++ b/htdocs/cashdesk/include/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cashdesk/javascript/index.php b/htdocs/cashdesk/javascript/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cashdesk/javascript/index.php +++ b/htdocs/cashdesk/javascript/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cashdesk/sql/index.php b/htdocs/cashdesk/sql/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cashdesk/sql/index.php +++ b/htdocs/cashdesk/sql/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cashdesk/tpl/index.php b/htdocs/cashdesk/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cashdesk/tpl/index.php +++ b/htdocs/cashdesk/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/compta/facture/index.php +++ b/htdocs/compta/facture/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index b2d73348949..e5ecde1a6be 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -15,7 +15,7 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require("../../main.inc.php"); @@ -57,8 +57,8 @@ $html=new Form($db); $year_current = strftime("%Y",dol_now()); $pastmonth = strftime("%m",dol_now()) - 1; -$pastmonthyear = $year_current; -if ($pastmonth == 0) +$pastmonthyear = $year_current; +if ($pastmonth == 0) { $pastmonth = 12; $pastmonthyear--; @@ -159,7 +159,7 @@ foreach ($tabfac as $key => $val) $invoicestatic->id=$key; $invoicestatic->ref=$val["ref"]; $invoicestatic->type=$val["type"]; - + print ""; // third party //print "".$conf->global->COMPTA_JOURNAL_SELL.""; @@ -204,5 +204,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date: 2011/07/31 21:26:51 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/contact/canvas/default/index.php b/htdocs/contact/canvas/default/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/contact/canvas/default/index.php +++ b/htdocs/contact/canvas/default/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/contact/canvas/default/tpl/index.php b/htdocs/contact/canvas/default/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/contact/canvas/default/tpl/index.php +++ b/htdocs/contact/canvas/default/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/contact/canvas/index.php b/htdocs/contact/canvas/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/contact/canvas/index.php +++ b/htdocs/contact/canvas/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/core/index.php b/htdocs/core/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/core/index.php +++ b/htdocs/core/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/core/tpl/index.php b/htdocs/core/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/core/tpl/index.php +++ b/htdocs/core/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/cron/index.php b/htdocs/cron/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/cron/index.php +++ b/htdocs/cron/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/externalsite/index.php b/htdocs/externalsite/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/externalsite/index.php +++ b/htdocs/externalsite/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..c7e0858fe09 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -28,7 +28,7 @@ * \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.19 2011/07/21 22:11:30 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -61,17 +61,8 @@ error_reporting(E_ALL ^ E_NOTICE); //error_reporting(E_ALL); -$conffiletoshowshort = "conf.php"; -# Define localization of conf file -$conffile = "conf/conf.php"; -$conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems -#$conffile = "/etc/dolibarr/conf.php"; -#$conffiletoshow = "/etc/dolibarr/conf.php"; - - // Include configuration -$result=@include_once($conffile); +$result=@include_once("conf/conf.php"); if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session { header("Location: install/index.php"); diff --git a/htdocs/fourn/paiement/index.php b/htdocs/fourn/paiement/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/fourn/paiement/index.php +++ b/htdocs/fourn/paiement/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/includes/adodbtime/index.php b/htdocs/includes/adodbtime/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/includes/adodbtime/index.php +++ b/htdocs/includes/adodbtime/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 24252ef481f..d04d2711843 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons) ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons) DaylingSavingTime=Horari d'estiu (usuari) CurrentHour=Hora PHP (servidor) -CompanyTZ=Zona Horària empresa (seu central) -CompanyHour=Hora empresa (seu central) +CompanyTZ=Zona Horària empresa (casa mare) +CompanyHour=Hora empresa (casa mare) CurrentSessionTimeOut=Time out sessió actual OSEnv=Entorn SO Box=Panell @@ -1246,9 +1246,9 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te CashDesk=TPV CashDeskSetup=Mòdul de configuració Terminal Punt de Venda CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes -CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa) -CashDeskBankAccountForCheque=Compte per defecte a utilitzar per als cobraments amb xecs -CashDeskBankAccountForCB=Compte per defecte a utilitzar per als cobraments amb targeta de crèdit +CashDeskBankAccountForSell=Compte a utilitzar per als cobraments en efectiu (caixa) +CashDeskBankAccountForCheque=Compte a utilitzar per als cobraments amb xecs +CashDeskBankAccountForCB=Compte a utilitzar per als cobraments amb targeta de crèdit CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes ##### Bookmark ##### BookmarkSetup=Configuració del mòdul Bookmark diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index c4ea6eac339..841addc52af 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos) ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos) DaylingSavingTime=Horario de verano (usuario) CurrentHour=Hora PHP (servidor) -CompanyTZ=Zona Horaria empresa (sede central) -CompanyHour=Hora empresa (sede central) +CompanyTZ=Zona Horaria empresa (casa madre) +CompanyHour=Hora empresa (casa madre) CurrentSessionTimeOut=Time out sesión actual OSEnv=Entorno SO Box=Panel @@ -1246,9 +1246,9 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te CashDesk=TPV CashDeskSetup=Configuración del módulo Terminal Punto de Venta CashDeskThirdPartyForSell=Tercero genérico a usar para la venta -CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja) -CashDeskBankAccountForCheque=Cuenta por defecto a utilizar para los cobros con cheques -CashDeskBankAccountForCB=Cuenta por defecto a utilizar para los cobros con tarjeta de crédito +CashDeskBankAccountForSell=Cuenta a utilizar para los cobros en efectivo (caja) +CashDeskBankAccountForCheque=Cuenta a utilizar para los cobros con cheques +CashDeskBankAccountForCB=Cuenta a utilizar para los cobros con tarjeta de crédito CashDeskIdWareHouse=Almacén a utilizar para las ventas ##### Bookmark ##### BookmarkSetup=Configuración del módulo Marcadores diff --git a/htdocs/lib/databases/index.php b/htdocs/lib/databases/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/lib/databases/index.php +++ b/htdocs/lib/databases/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/lib/index.php b/htdocs/lib/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/lib/index.php +++ b/htdocs/lib/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/livraison/index.php b/htdocs/livraison/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/livraison/index.php +++ b/htdocs/livraison/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/mantis/index.php b/htdocs/mantis/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/mantis/index.php +++ b/htdocs/mantis/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/paybox/index.php b/htdocs/paybox/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/paybox/index.php +++ b/htdocs/paybox/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/paypal/index.php b/htdocs/paypal/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/paypal/index.php +++ b/htdocs/paypal/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/canvas/default/index.php b/htdocs/product/canvas/default/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/canvas/default/index.php +++ b/htdocs/product/canvas/default/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/canvas/default/tpl/index.php b/htdocs/product/canvas/default/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/canvas/default/tpl/index.php +++ b/htdocs/product/canvas/default/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/canvas/index.php b/htdocs/product/canvas/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/canvas/index.php +++ b/htdocs/product/canvas/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/canvas/service/index.php b/htdocs/product/canvas/service/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/canvas/service/index.php +++ b/htdocs/product/canvas/service/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/canvas/service/tpl/index.php b/htdocs/product/canvas/service/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/canvas/service/tpl/index.php +++ b/htdocs/product/canvas/service/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/composition/index.php b/htdocs/product/composition/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/composition/index.php +++ b/htdocs/product/composition/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/product/stats/index.php +++ b/htdocs/product/stats/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/societe/canvas/default/index.php b/htdocs/societe/canvas/default/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/societe/canvas/default/index.php +++ b/htdocs/societe/canvas/default/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/societe/canvas/default/tpl/index.php b/htdocs/societe/canvas/default/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/societe/canvas/default/tpl/index.php +++ b/htdocs/societe/canvas/default/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/societe/canvas/individual/index.php b/htdocs/societe/canvas/individual/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/societe/canvas/individual/index.php +++ b/htdocs/societe/canvas/individual/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/societe/canvas/individual/tpl/index.php b/htdocs/societe/canvas/individual/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/societe/canvas/individual/tpl/index.php +++ b/htdocs/societe/canvas/individual/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/societe/checkvat/index.php b/htdocs/societe/checkvat/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/societe/checkvat/index.php +++ b/htdocs/societe/checkvat/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/auguria/fckeditor/index.php b/htdocs/theme/auguria/fckeditor/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/auguria/fckeditor/index.php +++ b/htdocs/theme/auguria/fckeditor/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/auguria/index.php b/htdocs/theme/auguria/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/auguria/index.php +++ b/htdocs/theme/auguria/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/auguria/tpl/index.php b/htdocs/theme/auguria/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/auguria/tpl/index.php +++ b/htdocs/theme/auguria/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/bureau2crea/fckeditor/index.php b/htdocs/theme/bureau2crea/fckeditor/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/bureau2crea/fckeditor/index.php +++ b/htdocs/theme/bureau2crea/fckeditor/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/bureau2crea/index.php b/htdocs/theme/bureau2crea/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/bureau2crea/index.php +++ b/htdocs/theme/bureau2crea/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/bureau2crea/tpl/index.php b/htdocs/theme/bureau2crea/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/bureau2crea/tpl/index.php +++ b/htdocs/theme/bureau2crea/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/cameleo/fckeditor/index.php b/htdocs/theme/cameleo/fckeditor/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/cameleo/fckeditor/index.php +++ b/htdocs/theme/cameleo/fckeditor/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/cameleo/index.php b/htdocs/theme/cameleo/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/cameleo/index.php +++ b/htdocs/theme/cameleo/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/cameleo/tpl/index.php b/htdocs/theme/cameleo/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/cameleo/tpl/index.php +++ b/htdocs/theme/cameleo/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/eldy/fckeditor/index.php b/htdocs/theme/eldy/fckeditor/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/eldy/fckeditor/index.php +++ b/htdocs/theme/eldy/fckeditor/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/eldy/index.php b/htdocs/theme/eldy/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/eldy/index.php +++ b/htdocs/theme/eldy/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/eldy/tpl/index.php b/htdocs/theme/eldy/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/eldy/tpl/index.php +++ b/htdocs/theme/eldy/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/freelug/fckeditor/index.php b/htdocs/theme/freelug/fckeditor/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/freelug/fckeditor/index.php +++ b/htdocs/theme/freelug/fckeditor/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/freelug/index.php b/htdocs/theme/freelug/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/freelug/index.php +++ b/htdocs/theme/freelug/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/freelug/tpl/index.php b/htdocs/theme/freelug/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/freelug/tpl/index.php +++ b/htdocs/theme/freelug/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/index.php b/htdocs/theme/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/index.php +++ b/htdocs/theme/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/phones/index.php b/htdocs/theme/phones/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/phones/index.php +++ b/htdocs/theme/phones/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/phones/smartphone/index.php b/htdocs/theme/phones/smartphone/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/phones/smartphone/index.php +++ b/htdocs/theme/phones/smartphone/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/phones/smartphone/theme/default/index.php b/htdocs/theme/phones/smartphone/theme/default/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/phones/smartphone/theme/default/index.php +++ b/htdocs/theme/phones/smartphone/theme/default/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/phones/smartphone/tpl/index.php b/htdocs/theme/phones/smartphone/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/phones/smartphone/tpl/index.php +++ b/htdocs/theme/phones/smartphone/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/yellow/fckeditor/index.php b/htdocs/theme/yellow/fckeditor/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/yellow/fckeditor/index.php +++ b/htdocs/theme/yellow/fckeditor/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/yellow/index.php b/htdocs/theme/yellow/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/yellow/index.php +++ b/htdocs/theme/yellow/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file diff --git a/htdocs/theme/yellow/tpl/index.php b/htdocs/theme/yellow/tpl/index.php index 7db0dd9ebf9..e69de29bb2d 100644 --- a/htdocs/theme/yellow/tpl/index.php +++ b/htdocs/theme/yellow/tpl/index.php @@ -1 +0,0 @@ -Url not available \ No newline at end of file