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

cvsimport

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-08 01:53:25 +00:00
commit f13f813326
22 changed files with 311 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/deb/templates
View File

@ -1,13 +1,14 @@
Template: dolibarr/reconfigure-webserver Template: dolibarr/reconfigure-webserver
Type: multiselect Type: multiselect
Choices: apache2, lighttpd Choices: apache2, lighttpd
Default: apache2, lighttpd
_Description: Web server to reconfigure automatically: _Description: Web server to reconfigure automatically:
Please choose the web server that should be automatically configured Please choose the web server that should be automatically configured
to run dolibarr. to run dolibarr.
Template: dolibarr/postrm Template: dolibarr/postrm
Type: boolean Type: boolean
Default: true Default: false
_Description: Delete database and uploaded files ? _Description: Delete database and uploaded files ?
Answer if you want to removed the Dolibarr MySQL database and all other 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 datas (datas related to this question are the Dolibarr DBMS account, all

4
build/exe/doliwamp/doliwamp.iss
View File

@ -10,7 +10,7 @@
; only the root user with no password, stop server and catch ; only the root user with no password, stop server and catch
; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory. ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
; ;
; Version: $Id: doliwamp.iss,v 1.84 2011/08/05 23:52:45 eldy Exp $ ; Version: $Id: doliwamp.iss,v 1.85 2011/08/07 16:37:45 eldy Exp $
;---------------------------------------------------------------------------------------- ;----------------------------------------------------------------------------------------
@ -397,7 +397,7 @@ begin
// Remove lock file // Remove lock file
lockfile := pathWithSlashes+'/www/dolibarr/install.lock'; lockfile := pathWithSlashes+'/dolibarr_documents/install.lock';
if FileExists (lockfile) and not DeleteFile(lockfile) then if FileExists (lockfile) and not DeleteFile(lockfile) then
begin begin
themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]); themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);

4
build/exe/doliwamp/rundoliwamp.bat.install
View File

@ -3,7 +3,7 @@ REM Launch Dolibarr
REM --------------- REM ---------------
REM If no lock file, we call install process REM If no lock file, we call install process
IF NOT EXIST www\dolibarr\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/ IF NOT EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/
REM If lock file exists, we call home page REM If lock file exists, we call home page
IF EXIST www\dolibarr\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/ IF EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/

252
build/makepack-dolibarr.pl
View File

@ -2,7 +2,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl # \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
# \version $Id: makepack-dolibarr.pl,v 1.135 2011/08/07 00:13:04 eldy Exp $ # \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> # \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -14,15 +14,15 @@ $MINOR="1";
$BUILD="0-beta"; # 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 $RPMSUBVERSION="auto"; # auto use value found into BUILD
@LISTETARGET=("TGZ","ZIP","RPM_GENE","RPM_FEDO","RPM_MAND","RPM_OPEN","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
%REQUIREMENTTARGET=( # Tool requirement for each package %REQUIREMENTTARGET=( # Tool requirement for each package
"SNAPSHOT"=>"tar", "SNAPSHOT"=>"tar",
"TGZ"=>"tar", "TGZ"=>"tar",
"ZIP"=>"7z", "ZIP"=>"7z",
"RPM_GENE"=>"rpmbuild", "RPM_GENERIC"=>"rpmbuild",
"RPM_FEDO"=>"rpmbuild", "RPM_FEDORA"=>"rpmbuild",
"RPM_MAND"=>"rpmbuild", "RPM_MANDRIVA"=>"rpmbuild",
"RPM_OPEN"=>"rpmbuild", "RPM_OPENSUSE"=>"rpmbuild",
"DEB"=>"dpkg", "DEB"=>"dpkg",
"APS"=>"zip", "APS"=>"zip",
"EXEDOLIWAMP"=>"iscc.exe" "EXEDOLIWAMP"=>"iscc.exe"
@ -40,19 +40,13 @@ $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}"; $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
if (-d "/usr/src/redhat") { if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat
# redhat if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake
$RPMDIR="/usr/src/redhat";
}
if (-d "/usr/src/RPM") {
# mandrake
$RPMDIR="/usr/src/RPM";
}
use vars qw/ $REVISION $VERSION /; use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.135 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)"; $VERSION="3.1 (build $REVISION)";
@ -65,7 +59,6 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
$SOURCE="$DIR/.."; $SOURCE="$DIR/..";
$DESTI="$SOURCE/build"; $DESTI="$SOURCE/build";
# Detect OS type # Detect OS type
# -------------- # --------------
if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; } if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
@ -101,9 +94,8 @@ if (! $TEMP || ! -d $TEMP) {
$BUILDROOT="$TEMP/buildroot"; $BUILDROOT="$TEMP/buildroot";
my $copyalreadydone=0; # Use - before number of choice to avoid copy my $copyalreadydone=0; # Use "-" before number of choice to avoid copy
my $batch=0; my $batch=0;
for (0..@ARGV-1) { for (0..@ARGV-1) {
if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; } if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; }
if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; } if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; }
@ -112,6 +104,8 @@ for (0..@ARGV-1) {
$FILENAMESNAPSHOT.="-".$PREFIX; $FILENAMESNAPSHOT.="-".$PREFIX;
} }
} }
if ($ENV{"DESTI"}) { $DESTI = $ENV{"DESTI"}; } # Force output dir if env DESTI is defined
print "Makepack version $VERSION\n"; print "Makepack version $VERSION\n";
print "Building package name: $PROJECT\n"; print "Building package name: $PROJECT\n";
@ -131,10 +125,10 @@ else {
my $NUM_SCRIPT; my $NUM_SCRIPT;
while (! $found) { while (! $found) {
my $cpt=0; my $cpt=0;
printf(" %d - %3s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET));
foreach my $target (@LISTETARGET) { foreach my $target (@LISTETARGET) {
$cpt++; $cpt++;
printf(" %d - %3s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
} }
# On demande de choisir le fichier à passer # On demande de choisir le fichier à passer
@ -163,7 +157,7 @@ else {
} }
else { else {
foreach my $key (@LISTETARGET) { foreach my $key (@LISTETARGET) {
$CHOOSEDTARGET{$key}=1; if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; }
} }
} }
} }
@ -238,6 +232,8 @@ if ($nboftargetok) {
if ($nboftargetneedbuildroot) if ($nboftargetneedbuildroot)
{ {
if (! $copyalreadydone) { if (! $copyalreadydone) {
print "Creation of a buildroot used for all packages\n";
print "Delete directory $BUILDROOT\n"; print "Delete directory $BUILDROOT\n";
$ret=`rm -fr "$BUILDROOT"`; $ret=`rm -fr "$BUILDROOT"`;
@ -319,14 +315,10 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.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 -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/smarty`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $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/freefont-20100919`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
} }
# Build package for each target # Build package for each target
@ -338,8 +330,10 @@ if ($nboftargetok) {
print "\nBuild package for target $target\n"; print "\nBuild package for target $target\n";
if ($target eq 'SNAPSHOT') { if ($target eq 'SNAPSHOT') {
$NEWDESTI=$DESTI;
print "Remove target $FILENAMESNAPSHOT.tgz...\n"; print "Remove target $FILENAMESNAPSHOT.tgz...\n";
unlink("$DESTI/$FILENAMESNAPSHOT.tgz"); unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
#rmdir "$BUILDROOT/$FILENAMESNAPSHOT"; #rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`; $ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
@ -352,22 +346,19 @@ if ($nboftargetok) {
$cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT"; $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
print $cmd."\n"; print $cmd."\n";
$ret=`$cmd`; $ret=`$cmd`;
if ($OS =~ /windows/i)
{ # Move to final dir
print "Move $FILENAMESNAPSHOT.tgz to $DESTI/$FILENAMESNAPSHOT.tgz\n"; print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
$ret=`mv "$FILENAMESNAPSHOT.tgz" "$DESTI/$FILENAMESNAPSHOT.tgz"`; $ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
}
else
{
print "Move $FILENAMESNAPSHOT.tgz to $DESTI/$FILENAMESNAPSHOT.tgz\n";
$ret=`mv "$FILENAMESNAPSHOT.tgz" "$DESTI/$FILENAMESNAPSHOT.tgz"`;
}
next; next;
} }
if ($target eq 'TGZ') { if ($target eq 'TGZ') {
$NEWDESTI=$DESTI;
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
print "Remove target $FILENAMETGZ.tgz...\n"; print "Remove target $FILENAMETGZ.tgz...\n";
unlink("$DESTI/$FILENAMETGZ.tgz"); unlink("$NEWDESTI/$FILENAMETGZ.tgz");
#rmdir "$BUILDROOT/$FILENAMETGZ"; #rmdir "$BUILDROOT/$FILENAMETGZ";
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
@ -376,24 +367,21 @@ if ($nboftargetok) {
$ret=`$cmd`; $ret=`$cmd`;
print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n"; print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ"; $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
$ret=`$cmd`; $ret=`$cmd`;
if ($OS =~ /windows/i)
{ # Move to final dir
print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n"; print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`; $ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
}
else
{
print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
}
next; next;
} }
if ($target eq 'ZIP') { if ($target eq 'ZIP') {
$NEWDESTI=$DESTI;
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
print "Remove target $FILENAMEZIP.zip...\n"; print "Remove target $FILENAMEZIP.zip...\n";
unlink("$DESTI/$FILENAMEZIP.zip"); unlink("$NEWDESTI/$FILENAMEZIP.zip");
#rmdir "$BUILDROOT/$FILENAMEZIP"; #rmdir "$BUILDROOT/$FILENAMEZIP";
$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`; $ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
@ -411,21 +399,20 @@ if ($nboftargetok) {
$ret= `$cmd`; $ret= `$cmd`;
chdir("$olddir"); chdir("$olddir");
if ($OS =~ /windows/i) # Move to final dir
{ print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n"; $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
}
else
{
print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
}
next; next;
} }
if ($target =~ /RPM/) { # Linux only if ($target =~ /RPM/) { # Linux only
#$ARCH='i386'; $NEWDESTI=$DESTI;
$subdir="package_rpm_generic";
if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; }
$ARCH='noarch'; $ARCH='noarch';
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
$newbuild = $BUILD; $newbuild = $BUILD;
@ -445,16 +432,34 @@ if ($nboftargetok) {
$FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1"; $FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1";
print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n"; print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n";
unlink("$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm"); unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm");
print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
#rmdir "$BUILDROOT/$FILENAMETGZ2";
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share\n"; print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share\n";
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share"`; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share"`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT\n"; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT\""; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT\"";
$ret=`$cmd`; $ret=`$cmd`;
print "Fix filefunc.inc.php, install/inc.php, support/inc.php\n";
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/filefunc.inc.php\" |
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/filefunc.inc.php\"";
$ret=`$cmd`;
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/install/inc.php\" |
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/install/inc.php\"";
$ret=`$cmd`;
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/support/inc.php\" |
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/support/inc.php\"";
$ret=`$cmd`;
print "Remove other files\n"; print "Remove other files\n";
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/ChangeLog`; $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/COPYING`;
@ -505,7 +510,7 @@ if ($nboftargetok) {
# To remove once stable # To remove once stable
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
# Apache conf files # Conf files
print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n";
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $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/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
@ -513,21 +518,6 @@ if ($nboftargetok) {
$ret=`cp "$SOURCE/build/rpm/conf.php" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/conf.php"`; $ret=`cp "$SOURCE/build/rpm/conf.php" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/conf.php"`;
$ret=`cp "$SOURCE/build/rpm/install.forced.php.install" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/install.forced.php"`; $ret=`cp "$SOURCE/build/rpm/install.forced.php.install" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/install.forced.php"`;
# 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 # Set owners
print "Set owners on files/dir\n"; print "Set owners on files/dir\n";
$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
@ -583,18 +573,24 @@ if ($nboftargetok) {
#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`; #$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`; $ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n"; # Move to final dir
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\""; print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
$ret=`$cmd`; $ret=`$cmd`;
print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\""; $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
$ret=`$cmd`;
print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
$ret=`$cmd`; $ret=`$cmd`;
next; next;
} }
if ($target eq 'DEB') if ($target eq 'DEB')
{ {
$NEWDESTI=$DESTI;
if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; }
$olddir=getcwd(); $olddir=getcwd();
$newbuild = $BUILD; $newbuild = $BUILD;
@ -609,16 +605,41 @@ if ($nboftargetok) {
# now build is 0 for example # now build is 0 for example
print "Remove target ${FILENAMEDEB}_all.deb...\n"; print "Remove target ${FILENAMEDEB}_all.deb...\n";
unlink("$DESTI/${FILENAMEDEB}_all.deb"); unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
print "Remove target ${FILENAMEDEB}.dsc...\n";
unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
print "Remove target ${FILENAMEDEB}.tar.gz...\n";
unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
print "Remove target ${FILENAMEDEB}.changes...\n";
unlink("$NEWDESTI/${FILENAMEDEB}.changes");
#rmdir "$BUILDROOT/$PROJECT.tmp"; #rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n"; print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\""; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
$ret=`$cmd`; $ret=`$cmd`;
print "Fix filefunc.inc.php, install/inc.php, support/inc.php\n";
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/filefunc.inc.php\" |
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/filefunc.inc.php\"";
$ret=`$cmd`;
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/install/inc.php\" |
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/install/inc.php\"";
$ret=`$cmd`;
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/support/inc.php\" |
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/support/inc.php\"";
$ret=`$cmd`;
# Create DEBIAN directory # Create DEBIAN directory
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
@ -803,7 +824,7 @@ if ($nboftargetok) {
$ret=`$cmd`; $ret=`$cmd`;
# Creation of source package # Creation of source package
print "Go to directory $BUILDROOT\n"; print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$cmd="dpkg-buildpackage -us -uc"; $cmd="dpkg-buildpackage -us -uc";
@ -813,26 +834,19 @@ if ($nboftargetok) {
chdir("$olddir"); chdir("$olddir");
if ($OS =~ /windows/i) # Move to final dir
{ print "Move *_all.deb to $NEWDESTI\n";
print "Move *_all.deb to $DESTI\n"; $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; $ret=`mv $BUILDROOT/*.tar.gz "$NEWDESTI/"`;
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
}
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/"`;
}
next; next;
} }
if ($target eq 'APS') { if ($target eq 'APS') {
$NEWDESTI=$DESTI;
if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; }
$newbuild = $BUILD; $newbuild = $BUILD;
$newbuild =~ s/(dev|alpha)/0/gi; # dev $newbuild =~ s/(dev|alpha)/0/gi; # dev
$newbuild =~ s/beta/1/gi; # beta $newbuild =~ s/beta/1/gi; # beta
@ -844,7 +858,7 @@ if ($nboftargetok) {
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
print "Remove target $FILENAMEAPS.zip...\n"; print "Remove target $FILENAMEAPS.zip...\n";
unlink "$DESTI/$FILENAMEAPS.zip"; unlink "$NEWDESTI/$FILENAMEAPS.zip";
#rmdir "$BUILDROOT/$PROJECT.tmp"; #rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
@ -917,31 +931,29 @@ if ($nboftargetok) {
$ret= `$cmd`; $ret= `$cmd`;
chdir("$olddir"); chdir("$olddir");
if ($OS =~ /windows/i) # Move to final dir
{ print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
print "Move $BUILDROOT/$FILENAMEAPS.zip to $DESTI/$FILENAMEAPS.zip\n"; $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
$ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$DESTI/$FILENAMEAPS.zip"`;
}
else
{
print "Move $BUILDROOT/$FILENAMEAPS.zip to $DESTI/$FILENAMEAPS.zip\n";
$ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$DESTI/$FILENAMEAPS.zip"`;
}
next; next;
} }
if ($target eq 'EXEDOLIWAMP') if ($target eq 'EXEDOLIWAMP')
{ {
$NEWDESTI=$DESTI;
if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; }
print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
unlink "$DESTI/$FILENAMEEXEDOLIWAMP.exe"; unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
$cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\""; $cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"";
print "$cmd\n"; print "$cmd\n";
$ret= `$cmd`; $ret= `$cmd`;
#print "$ret\n"; #print "$ret\n";
print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $DESTI/$FILENAMEEXEDOLIWAMP.exe\n";
rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$DESTI/$FILENAMEEXEDOLIWAMP.exe"); # Move to final dir
print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
next; next;
} }
} }

7
build/makepack-howto.txt
View File

@ -19,10 +19,9 @@ beta version of Dolibarr, step by step.
- Add a CVS Tag (DOLIBARR_x_y_BETA) - Add a CVS Tag (DOLIBARR_x_y_BETA)
- Create a branch (DOLIBARR_x_y_BRANCH). - Create a branch (DOLIBARR_x_y_BRANCH).
- Update the CVS on server that build automatically the tgz beta package - Run makepack-dolibarr.pl to generate all packages.
or build Dolibarr and DoliWamp with makepack-dolibarr.pl - Enable the category that point to the beta files on joomla
- Enable entries on joomla web site www.dolibarr.org with links web site www.dolibarr.org
that point to that file ("Dolibarr CVS snapshot of current beta").
- Post a news on dolibarr.org/dolibarr.fr - Post a news on dolibarr.org/dolibarr.fr
- Send mail on mailings-list - Send mail on mailings-list

28
build/rpm/dolibarr_fedora.spec
View File

@ -6,10 +6,8 @@
# edit it if you need to match your rules. # edit it if you need to match your rules.
# -------------------------------------------------------- # --------------------------------------------------------
%define version __VERSION__
Name: dolibarr Name: dolibarr
Version: %{version} Version: __VERSION__
Release: __RELEASE__%{?dist} Release: __RELEASE__%{?dist}
Summary: ERP and CRM software for small and medium companies or foundations 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(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
@ -21,16 +19,14 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz
BuildArch: noarch BuildArch: noarch
#BuildArchitectures: noarch #BuildArchitectures: noarch
BuildRoot: %{_tmppath}/dolibarr-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Applications/Internet Group: Applications/Internet
Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql
# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
AutoReqProv: no AutoReqProv: no
@ -93,7 +89,8 @@ cui hai bisogno ed essere facile da usare.
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__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 %{__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 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
%{__desktop-file-install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop #desktop-file-install -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
%{__install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build %{__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/htdocs
@ -116,15 +113,15 @@ cui hai bisogno ed essere facile da usare.
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc /usr/share/doc/dolibarr %doc %_datadir/doc/dolibarr
%dir /usr/share/dolibarr/build %dir %_datadir/dolibarr/build
%dir /usr/share/dolibarr/htdocs %dir %_datadir/dolibarr/htdocs
%dir /usr/share/dolibarr/scripts %dir %_datadir/dolibarr/scripts
%_datadir/pixmaps/dolibarr.png %_datadir/pixmaps/dolibarr.png
%_datadir/applications/dolibarr.desktop %_datadir/applications/dolibarr.desktop
/usr/share/dolibarr/build/* %_datadir/dolibarr/build/*
/usr/share/dolibarr/htdocs/* %_datadir/dolibarr/htdocs/*
/usr/share/dolibarr/scripts/* %_datadir/dolibarr/scripts/*
%defattr(0664, -, -) %defattr(0664, -, -)
%config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@ -150,6 +147,7 @@ export apachegroup='apache';
echo Create document directory $docdir echo Create document directory $docdir
%{__mkdir} -p $docdir %{__mkdir} -p $docdir
# Set correct owner on config files
%{__chown} -R root:$apachegroup /etc/dolibarr/* %{__chown} -R root:$apachegroup /etc/dolibarr/*
# Create config for se $seconfig # Create config for se $seconfig

74
build/rpm/dolibarr_generic.spec
View File

@ -6,10 +6,8 @@
# edit it if you need to match your rules. # edit it if you need to match your rules.
# -------------------------------------------------------- # --------------------------------------------------------
%define version __VERSION__
Name: dolibarr Name: dolibarr
Version: %{version} Version: __VERSION__
Release: __RELEASE__ Release: __RELEASE__
Summary: ERP and CRM software for small and medium companies or foundations 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(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
@ -21,18 +19,18 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz
BuildArch: noarch BuildArch: noarch
#BuildArchitectures: noarch #BuildArchitectures: noarch
BuildRoot: %{_tmppath}/dolibarr-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# For Mandriva-Mageia # For Mandriva-Mageia
Group: Networking/WWW Group: Networking/WWW
# For all other distrib # For all other distrib
Group: Applications/Internet Group: Applications/Internet
# Requires for Fedora-Redhat # Requires for Fedora-Redhat
Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap
Requires: php-mysql >= 4.1.0
# Requires for OpenSuse # Requires for OpenSuse
#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl #Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl
# Requires for Mandriva-Mageia # Requires for Mandriva-Mageia
@ -124,37 +122,37 @@ cui hai bisogno ed essere facile da usare.
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc /usr/share/doc/dolibarr %doc %_datadir/doc/dolibarr
%dir /usr/share/dolibarr/build %dir %_datadir/dolibarr/build
%dir /usr/share/dolibarr/htdocs %dir %_datadir/dolibarr/htdocs
%dir /usr/share/dolibarr/scripts %dir %_datadir/dolibarr/scripts
%_datadir/pixmaps/dolibarr.png %_datadir/pixmaps/dolibarr.png
%_datadir/applications/dolibarr.desktop %_datadir/applications/dolibarr.desktop
/usr/share/dolibarr/build/* %_datadir/dolibarr/build/*
/usr/share/dolibarr/htdocs/* %_datadir/dolibarr/htdocs/*
/usr/share/dolibarr/scripts/* %_datadir/dolibarr/scripts/*
#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA #lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA
#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES #lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES
#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK #lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK
#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT #lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT
#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE #lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE
#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR #lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR
#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU #lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU
#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB #lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB
#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN #lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN
#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ #lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ
#lang(en) /usr/share/dolibarr/htdocs/langs/en_US #lang(en) %_datadir/dolibarr/htdocs/langs/en_US
#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR #lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR
#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES #lang(es) %_datadir/dolibarr/htdocs/langs/es_ES
#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN #lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN
#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX #lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX
#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR #lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR
#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR #lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR
#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI #lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI
#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE #lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE
#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA #lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA
#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH #lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH
#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR #lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR
%defattr(0664, -, -) %defattr(0664, -, -)
%config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@ -220,6 +218,8 @@ then
%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.install | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig %{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.install | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
%{__chmod} -R 660 $installconfig %{__chmod} -R 660 $installconfig
fi fi
# Set correct owner on config files
%{__chown} -R root:$apachegroup /etc/dolibarr/* %{__chown} -R root:$apachegroup /etc/dolibarr/*
# Create config for se $seconfig # Create config for se $seconfig
@ -227,10 +227,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
echo Add SE Linux permissions for dolibarr echo Add SE Linux permissions for dolibarr
# semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local # 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 "/etc/dolibarr(/.*?)"
#semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)"
semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
restorecon -R -v /etc/dolibarr restorecon -R -v /etc/dolibarr
#restorecon -R -v /usr/share/dolibarr
restorecon -R -v /var/lib/dolibarr restorecon -R -v /var/lib/dolibarr
fi fi

25
build/rpm/dolibarr_mandriva.spec
View File

@ -6,10 +6,8 @@
# edit it if you need to match your rules. # edit it if you need to match your rules.
# -------------------------------------------------------- # --------------------------------------------------------
%define version __VERSION__
Name: dolibarr Name: dolibarr
Version: %{version} Version: __VERSION__
Release: __RELEASE__ Release: __RELEASE__
Summary: ERP and CRM software for small and medium companies or foundations 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(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
@ -21,16 +19,14 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz
BuildArch: noarch BuildArch: noarch
#BuildArchitectures: noarch #BuildArchitectures: noarch
BuildRoot: %{_tmppath}/dolibarr-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Networking/WWW Group: Networking/WWW
Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl
# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
AutoReqProv: no AutoReqProv: no
@ -116,15 +112,15 @@ cui hai bisogno ed essere facile da usare.
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc /usr/share/doc/dolibarr %doc %_datadir/doc/dolibarr
%dir /usr/share/dolibarr/build %dir %_datadir/dolibarr/build
%dir /usr/share/dolibarr/htdocs %dir %_datadir/dolibarr/htdocs
%dir /usr/share/dolibarr/scripts %dir %_datadir/dolibarr/scripts
%_datadir/pixmaps/dolibarr.png %_datadir/pixmaps/dolibarr.png
%_datadir/applications/dolibarr.desktop %_datadir/applications/dolibarr.desktop
/usr/share/dolibarr/build/* %_datadir/dolibarr/build/*
/usr/share/dolibarr/htdocs/* %_datadir/dolibarr/htdocs/*
/usr/share/dolibarr/scripts/* %_datadir/dolibarr/scripts/*
%defattr(0664, -, -) %defattr(0664, -, -)
%config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@ -150,6 +146,7 @@ export apachegroup='apache';
echo Create document directory $docdir echo Create document directory $docdir
%{__mkdir} -p $docdir %{__mkdir} -p $docdir
# Set correct owner on config files
%{__chown} -R root:$apachegroup /etc/dolibarr/* %{__chown} -R root:$apachegroup /etc/dolibarr/*
# Create a config link dolibarr.conf # Create a config link dolibarr.conf

25
build/rpm/dolibarr_opensuse.spec
View File

@ -6,10 +6,8 @@
# edit it if you need to match your rules. # edit it if you need to match your rules.
# -------------------------------------------------------- # --------------------------------------------------------
%define version __VERSION__
Name: dolibarr Name: dolibarr
Version: %{version} Version: __VERSION__
Release: __RELEASE__ Release: __RELEASE__
Summary: ERP and CRM software for small and medium companies or foundations 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(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
@ -21,16 +19,14 @@ License: GPLv2+
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
URL: http://www.dolibarr.org URL: http://www.dolibarr.org
Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz
BuildArch: noarch BuildArch: noarch
#BuildArchitectures: noarch #BuildArchitectures: noarch
BuildRoot: %{_tmppath}/dolibarr-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Applications/Internet Group: Applications/Internet
Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl
# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
AutoReqProv: no AutoReqProv: no
@ -115,15 +111,15 @@ cui hai bisogno ed essere facile da usare.
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc /usr/share/doc/dolibarr %doc %_datadir/doc/dolibarr
%dir /usr/share/dolibarr/build %dir %_datadir/dolibarr/build
%dir /usr/share/dolibarr/htdocs %dir %_datadir/dolibarr/htdocs
%dir /usr/share/dolibarr/scripts %dir %_datadir/dolibarr/scripts
%_datadir/pixmaps/dolibarr.png %_datadir/pixmaps/dolibarr.png
%_datadir/applications/dolibarr.desktop %_datadir/applications/dolibarr.desktop
/usr/share/dolibarr/build/* %_datadir/dolibarr/build/*
/usr/share/dolibarr/htdocs/* %_datadir/dolibarr/htdocs/*
/usr/share/dolibarr/scripts/* %_datadir/dolibarr/scripts/*
%defattr(0664, -, -) %defattr(0664, -, -)
%config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@ -149,6 +145,7 @@ export apachegroup='www';
echo Create document directory $docdir echo Create document directory $docdir
%{__mkdir} -p $docdir %{__mkdir} -p $docdir
# Set correct owner on config files
%{__chown} -R root:$apachegroup /etc/dolibarr/* %{__chown} -R root:$apachegroup /etc/dolibarr/*
# Create a config link dolibarr.conf # Create a config link dolibarr.conf

1
build/rpm/file_contexts.dolibarr
View File

@ -2,5 +2,4 @@
# It is provided as example to know contexts modified by installer # It is provided as example to know contexts modified by installer
# to make Dolibarr working. # to make Dolibarr working.
/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /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 /var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0

12
htdocs/comm/propal.php
View File

@ -26,7 +26,7 @@
* \file htdocs/comm/propal.php * \file htdocs/comm/propal.php
* \ingroup propale * \ingroup propale
* \brief Page of commercial proposals card and list * \brief Page of commercial proposals card and list
* \version $Id: propal.php,v 1.614 2011/08/03 00:46:26 eldy Exp $ * \version $Id: propal.php,v 1.615 2011/08/08 01:53:26 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -818,6 +818,10 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
$localtax2_rate=get_localtax($vat_rate,2,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client);
$up_ht=GETPOST('pu')?GETPOST('pu'):GETPOST('subprice'); $up_ht=GETPOST('pu')?GETPOST('pu'):GETPOST('subprice');
// Define special_code for special lines
$special_code=0;
if (empty($_POST['qty'])) $special_code=3;
// On verifie que le prix minimum est respecte // On verifie que le prix minimum est respecte
$productid = $_POST['productid'] ; $productid = $_POST['productid'] ;
if ($productid) if ($productid)
@ -843,7 +847,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
$_POST['desc'], $_POST['desc'],
'HT', 'HT',
$info_bits, $info_bits,
'', $special_code,
$_POST['fk_parent_line'] $_POST['fk_parent_line']
); );
@ -1828,7 +1832,7 @@ else
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($socid); $soc->fetch($socid);
} }
$param='&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut; $param='&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut;
if ($month) $param.='&amp;month='.$month; if ($month) $param.='&amp;month='.$month;
if ($year) $param.='&amp;year='.$year; if ($year) $param.='&amp;year='.$year;
@ -1975,6 +1979,6 @@ else
} }
$db->close(); $db->close();
llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.614 $'); llxFooter('$Date: 2011/08/08 01:53:26 $ - $Revision: 1.615 $');
?> ?>

35
htdocs/comm/propal/class/propal.class.php
View File

@ -29,7 +29,7 @@
* \author Rodolphe Qiedeville * \author Rodolphe Qiedeville
* \author Eric Seigne * \author Eric Seigne
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: propal.class.php,v 1.110 2011/08/03 00:46:39 eldy Exp $ * \version $Id: propal.class.php,v 1.111 2011/08/08 01:53:26 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
@ -431,18 +431,20 @@ class Propal extends CommonObject
/** /**
* \brief Mise a jour d'une ligne de produit * Update a proposal line
* \param rowid Id de la ligne * @param rowid Id de la ligne
* \param pu Prix unitaire (HT ou TTC selon price_base_type) * @param pu Prix unitaire (HT ou TTC selon price_base_type)
* \param qty Quantity * @param qty Quantity
* \param remise_percent Remise effectuee sur le produit * @param remise_percent Remise effectuee sur le produit
* \param txtva Taux de TVA * @param txtva Taux de TVA
* \param txlocaltax1 Local tax 1 rate * @param txlocaltax1 Local tax 1 rate
* \param txlocaltax2 Local tax 2 rate * @param txlocaltax2 Local tax 2 rate
* \param desc Description * @param desc Description
* \param price_base_type HT ou TTC * @param price_base_type HT ou TTC
* \param info_bits Miscellanous informations * @param info_bits Miscellanous informations
* \return int 0 en cas de succes * @param special_code Set special code ('' = we don't change it)
* @param fk_parent_line Id of line parent
* @return int 0 en cas de succes
*/ */
function updateline($rowid, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0) function updateline($rowid, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0)
{ {
@ -458,6 +460,8 @@ class Propal extends CommonObject
$txtva = price2num($txtva); $txtva = price2num($txtva);
$txlocaltax1=price2num($txlocaltax1); $txlocaltax1=price2num($txlocaltax1);
$txlocaltax2=price2num($txlocaltax2); $txlocaltax2=price2num($txlocaltax2);
if (empty($qty) && empty($special_code)) $special_code=3; // Set option tag
if (! empty($qty) && $special_code == 3) $special_code=0; // Remove option tag
if ($this->statut == 0) if ($this->statut == 0)
{ {
@ -508,8 +512,6 @@ class Propal extends CommonObject
$this->line->fk_parent_line=$fk_parent_line; $this->line->fk_parent_line=$fk_parent_line;
$this->line->skip_update_total=$skip_update_total; $this->line->skip_update_total=$skip_update_total;
if (empty($qty) && empty($special_code)) $this->line->special_code=3;
// TODO deprecated // TODO deprecated
$this->line->price=$price; $this->line->price=$price;
$this->line->remise=$remise; $this->line->remise=$remise;
@ -2671,12 +2673,11 @@ class PropaleLigne
$sql.= " , marge_tx='".$this->marge_tx."'"; $sql.= " , marge_tx='".$this->marge_tx."'";
$sql.= " , marque_tx='".$this->marque_tx."'"; $sql.= " , marque_tx='".$this->marque_tx."'";
$sql.= " , info_bits=".$this->info_bits; $sql.= " , info_bits=".$this->info_bits;
if ($this->special_code != '') $sql.= " , special_code=".$this->special_code; if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
$sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null"); $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
$sql.= " WHERE rowid = ".$this->rowid; $sql.= " WHERE rowid = ".$this->rowid;
dol_syslog("PropaleLigne::update sql=$sql"); dol_syslog("PropaleLigne::update sql=$sql");
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {

28
htdocs/commande/class/commande.class.php
View File

@ -24,7 +24,7 @@
* \file htdocs/commande/class/commande.class.php * \file htdocs/commande/class/commande.class.php
* \ingroup commande * \ingroup commande
* \brief Fichier des classes de commandes * \brief Fichier des classes de commandes
* \version $Id: commande.class.php,v 1.120 2011/07/31 22:23:14 eldy Exp $ * \version $Id: commande.class.php,v 1.121 2011/08/08 01:10:07 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
@ -2481,12 +2481,12 @@ class Commande extends CommonObject
} }
if ($mode == 2) if ($mode == 2)
{ {
if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceledShort'),'statut5').' '.$langs->trans('StatusOrderCanceled'); if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
if ($statut==0) return img_picto($langs->trans('StatusOrderDraftShort'),'statut0').' '.$langs->trans('StatusOrderDraft'); if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
if ($statut==1) return img_picto($langs->trans('StatusOrderValidatedShort'),'statut1').' '.$langs->trans('StatusOrderValidated'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort');
if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSentShort'); if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$langs->trans('StatusOrderSentShort');
if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBillShort'),'statut7').' '.$langs->trans('StatusOrderToBill'); if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessedShort'),'statut6').' '.$langs->trans('StatusOrderProcessed'); if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
} }
if ($mode == 3) if ($mode == 3)
{ {
@ -2502,18 +2502,18 @@ class Commande extends CommonObject
if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled'); if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft'); if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated');
if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSentShort'); if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderOnProcess');
if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill'); if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
} }
if ($mode == 5) if ($mode == 5)
{ {
if ($statut==-1) return $langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceledShort'),'statut5'); if ($statut==-1) return $langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
if ($statut==0) return $langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraftShort'),'statut0'); if ($statut==0) return $langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==1) return $langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidatedShort'),'statut1'); if ($statut==1) return $langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidated'),'statut1');
if ($statut==2) return $langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSentShort'),'statut3'); if ($statut==2) return $langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBillShort'),'statut7'); if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7');
if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessedShort'),'statut6'); if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
} }
} }

14
htdocs/compta/paiement.php
View File

@ -23,7 +23,7 @@
* \file htdocs/compta/paiement.php * \file htdocs/compta/paiement.php
* \ingroup compta * \ingroup compta
* \brief Page to create a payment * \brief Page to create a payment
* \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ * \version $Id: paiement.php,v 1.114 2011/08/08 01:01:46 eldy Exp $
*/ */
require('../main.inc.php'); require('../main.inc.php');
@ -289,7 +289,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
json["amountPayment"] = jQuery("#amountpayment").attr("value"); json["amountPayment"] = jQuery("#amountpayment").attr("value");
json["amounts"] = elemToJson(form.find("input[name*=\"amount_\"]")); json["amounts"] = elemToJson(form.find("input[name*=\"amount_\"]"));
json["remains"] = elemToJson(form.find("input[name*=\"remain_\"]")); json["remains"] = elemToJson(form.find("input[name*=\"remain_\"]"));
if(imgId != null)json["imgClicked"] = imgId; if(imgId != null)json["imgClicked"] = imgId;
jQuery.post("ajaxpayment.php", json, function(data) jQuery.post("ajaxpayment.php", json, function(data)
@ -300,13 +300,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
for(var key in json) for(var key in json)
{ {
if(key == "result") { if(key == "result") {
if(json["makeRed"]) { if(json["makeRed"]) {
jQuery("#"+key).css("color", "red"); jQuery("#"+key).css("color", "red");
} else { } else {
jQuery("#"+key).removeAttr("style"); jQuery("#"+key).removeAttr("style");
} }
json[key]=json["label"]+" "+json[key]; json[key]=json["label"]+" "+json[key];
jQuery("#"+key).text(json[key]); jQuery("#"+key).text(json[key]);
} else { } else {
form.find("input[name*=\""+key+"\"]").each(function() { form.find("input[name*=\""+key+"\"]").each(function() {
@ -581,7 +581,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$langs->load("withdrawals"); $langs->load("withdrawals");
if ($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed"); if ($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
}*/ }*/
print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>'; print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"><br><br></center>';
// print '</td></tr>'; // print '</td></tr>';
} }
@ -672,5 +672,5 @@ if (! GETPOST('action'))
$db->close(); $db->close();
llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); llxFooter('$Date: 2011/08/08 01:01:46 $ - $Revision: 1.114 $');
?> ?>

5
htdocs/compta/paiement/class/paiement.class.php
View File

@ -21,7 +21,7 @@
* \file htdocs/compta/paiement/class/paiement.class.php * \file htdocs/compta/paiement/class/paiement.class.php
* \ingroup facture * \ingroup facture
* \brief File of class to manage payments of customers invoices * \brief File of class to manage payments of customers invoices
* \version $Id: paiement.class.php,v 1.23 2011/08/05 21:06:55 eldy Exp $ * \version $Id: paiement.class.php,v 1.24 2011/08/08 01:01:45 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
@ -200,7 +200,8 @@ class Paiement extends CommonObject
} }
} }
if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more."); if ($invoice->type != 0 && $invoice->type != 1) dol_syslog("Invoice ".$facid." is not a standard nor replacement invoice. We do nothing more.");
else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more."); else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
else $result=$invoice->set_paid($user,'',''); else $result=$invoice->set_paid($user,'','');
} }

4
htdocs/install/mysql/tables/llx_propaldet.sql
View File

@ -16,7 +16,7 @@
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- --
-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- $Id: llx_propaldet.sql,v 1.10 2011/08/08 01:53:25 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_propaldet create table llx_propaldet
@ -49,7 +49,7 @@ create table llx_propaldet
marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat) marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat)
marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente) marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente)
special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales special_code integer DEFAULT 0, -- code pour les lignes speciales
rang integer DEFAULT 0 -- ordre affichage sur la propal rang integer DEFAULT 0 -- ordre affichage sur la propal
)ENGINE=innodb; )ENGINE=innodb;

2
htdocs/langs/en_US/bills.lang
View File

@ -366,7 +366,7 @@ DisabledBecausePayments=Not possible since there is some payments
CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed
ExpectedToPay=Expected payment ExpectedToPay=Expected payment
PayedByThisPayment=Payed by this payment PayedByThisPayment=Payed by this payment
ClosePaidInvoicesAutomatically=Classify "Payed" all invoices entierely payed. ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entierely payed.
AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed". AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed".
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice

2
htdocs/langs/en_US/orders.lang
View File

@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Supplier's orders to process
StatusOrderCanceledShort=Canceled StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated StatusOrderValidatedShort=Validated
StatusOrderSentShort=Shipment in process StatusOrderSentShort=In process
StatusOrderOnProcessShort=Reception StatusOrderOnProcessShort=Reception
StatusOrderProcessedShort=Processed StatusOrderProcessedShort=Processed
StatusOrderToBillShort=To bill StatusOrderToBillShort=To bill

2
htdocs/langs/fr_FR/bills.lang
View File

@ -366,7 +366,7 @@ DisabledBecausePayments=Non disponible car il existe des paiements
CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée. CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée.
ExpectedToPay=Paiement attendu ExpectedToPay=Paiement attendu
PayedByThisPayment=Règlé par ce paiement PayedByThisPayment=Règlé par ce paiement
ClosePaidInvoicesAutomatically=Classer automatiquement à "Payé" les factures entièrement payées. ClosePaidInvoicesAutomatically=Classer automatiquement à "Payé" les factures standards et de remplacement entièrement payées.
AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé". AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé".
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client

2
htdocs/langs/fr_FR/orders.lang
View File

@ -29,7 +29,7 @@ StatusOrderCanceledShort=Annulée
StatusOrderDraftShort=Brouillon StatusOrderDraftShort=Brouillon
StatusOrderValidatedShort=Validée StatusOrderValidatedShort=Validée
StatusOrderOnProcessShort=Réception StatusOrderOnProcessShort=Réception
StatusOrderSentShort=Expédition en cours StatusOrderSentShort=Envoi en cours
StatusOrderProcessedShort=Traitée StatusOrderProcessedShort=Traitée
StatusOrderToBillShort=À facturer StatusOrderToBillShort=À facturer
StatusOrderApprovedShort=Approuvée StatusOrderApprovedShort=Approuvée

11
htdocs/support/inc.php
View File

@ -21,7 +21,7 @@
/** /**
* \file htdocs/support/inc.php * \file htdocs/support/inc.php
* \brief File that define environment for support pages * \brief File that define environment for support pages
* \version $Id: inc.php,v 1.31 2011/07/31 23:22:33 eldy Exp $ * \version $Id: inc.php,v 1.32 2011/08/07 13:10:26 eldy Exp $
*/ */
define('DOL_VERSION','2.5-dev'); // Also defined in htdocs/master.inc.php define('DOL_VERSION','2.5-dev'); // Also defined in htdocs/master.inc.php
@ -63,7 +63,16 @@ else
$includeconferror=''; $includeconferror='';
# Define vars
$conffiletoshowshort = "conf.php";
# Define localization of conf file
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
# For debian/redhat like systems
#$conffile = "/etc/dolibarr/conf.php";
#$conffiletoshow = "/etc/dolibarr/conf.php";
$charset="UTF-8"; // If not output format found in any conf file $charset="UTF-8"; // If not output format found in any conf file
if (! defined('DONOTLOADCONF') && file_exists($conffile)) if (! defined('DONOTLOADCONF') && file_exists($conffile))
{ {

52
htdocs/theme/eldy/style.css.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2007-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -20,7 +21,7 @@
/** /**
* \file htdocs/theme/eldy/style.css.php * \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy * \brief Fichier de style CSS du theme Eldy
* \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
@ -815,10 +816,9 @@ div.tabBar {
padding-right: 8px; padding-right: 8px;
padding-bottom: 8px; padding-bottom: 8px;
margin: 0px 0px 10px 0px; margin: 0px 0px 10px 0px;
-moz-border-radius-topleft:6px; -moz-border-radius:6px;
-moz-border-radius-topright:6px; -webkit-border-radius: 6px;
-moz-border-radius-bottomleft:6px; border-radius: 6px;
-moz-border-radius-bottomright:6px;
border-right: 1px solid #555555; border-right: 1px solid #555555;
border-bottom: 1px solid #555555; border-bottom: 1px solid #555555;
border-left: 1px solid #D0D0D0; border-left: 1px solid #D0D0D0;
@ -856,8 +856,9 @@ a.tab:link {
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-topleft:6px; -moz-border-radius:6px 6px 0px 0px;
-moz-border-radius-topright:6px; -webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
@ -871,8 +872,9 @@ a.tab:visited {
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-topleft:6px; -moz-border-radius:6px 6px 0px 0px;
-moz-border-radius-topright:6px; -webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
@ -886,8 +888,9 @@ a.tab#active {
padding: 0px 6px; padding: 0px 6px;
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
-moz-border-radius-topleft:6px; -moz-border-radius:6px 6px 0px 0px;
-moz-border-radius-topright:6px; -webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
@ -901,8 +904,9 @@ a.tab:hover {
padding: 0px 6px; padding: 0px 6px;
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
-moz-border-radius-topleft:6px; -moz-border-radius:6px 6px 0px 0px;
-moz-border-radius-topright:6px; -webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
@ -928,8 +932,9 @@ span.tabspan {
margin: 0em 0.2em; margin: 0em 0.2em;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-topleft:6px; -moz-border-radius:6px 6px 0px 0px;
-moz-border-radius-topright:6px; -webkit-border-radius:6px 6px 0px 0px;
border-radius:6px 6px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
@ -1211,6 +1216,7 @@ border: 0px;
box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC;
} }
.box { .box {
padding-right: 0px; padding-right: 0px;
padding-left: 0px; padding-left: 0px;
@ -1227,8 +1233,6 @@ font-family: <?php print $fontlist ?>, sans-serif;
font-weight: normal; font-weight: normal;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-topleft:6px;
-moz-border-radius-topright:6px;
} }
tr.box_impair { tr.box_impair {
@ -1269,6 +1273,8 @@ div.warning {
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #e0e0d0; border: 1px solid #e0e0d0;
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius: 6px;
border-radius: 6px;
background: #efefd4; background: #efefd4;
} }
@ -1278,6 +1284,8 @@ div.error {
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #8C9CAB; border: 1px solid #8C9CAB;
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius: 6px;
border-radius: 6px;
background: #EFCFCF; background: #EFCFCF;
} }
@ -1288,6 +1296,8 @@ div.info {
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #e0e0d0; border: 1px solid #e0e0d0;
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius: 6px;
border-radius:6px;
background: #efefd4; background: #efefd4;
} }
@ -1381,6 +1391,8 @@ z-index: 3000;
background-color: #FFFFF0; background-color: #FFFFF0;
opacity: 1; opacity: 1;
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius: 6px;
border-radius: 6px;
} }
@ -1402,7 +1414,9 @@ opacity: 1;
} }
.bodyline { .bodyline {
-moz-border-radius:8px; -moz-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 8px;
border: 1px #E4ECEC outset; border: 1px #E4ECEC outset;
padding: 0px; padding: 0px;
margin-bottom: 5px; margin-bottom: 5px;
@ -1498,7 +1512,7 @@ td.hidden {
.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; }
table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; } table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
.cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } .cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; }
.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; } .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }