From 6dc0880e8ba1eccc12c18861770e945b4bac8a64 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 13:10:26 +0000 Subject: [PATCH 01/88] Work on rpm package From 79b3f4184944bb1f0a281602abf7d0c28c5b63c4 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 15:06:23 +0000 Subject: [PATCH 02/88] =?UTF-8?q?fix=20some=20issues=20and=20get=20compati?= =?UTF-8?q?ble=20with=20:=20Saf3-4,=20iOS=201-3.2,=20Android=20<1.6=20Oper?= =?UTF-8?q?a=2010.5,=20IE9,=20Saf5,=20Chrome,=20FF4,=20iOS=204,=20Android?= =?UTF-8?q?=202.1+=20and=20IE6=96IE9=20for=20shadow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/theme/eldy/style.css.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..7a2f0d52a8a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1214,6 +1214,14 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + } From 90adcd544049b6b0d544f1cf4bae1fab9a7033d2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:07:44 +0000 Subject: [PATCH 03/88] Work on package --- build/makepack-dolibarr.pl | 34 +++++++++------ build/rpm/dolibarr_fedora.spec | 26 +++++++----- build/rpm/dolibarr_generic.spec | 72 +++++++++++++++++--------------- build/rpm/dolibarr_mandriva.spec | 24 ++++++----- build/rpm/dolibarr_opensuse.spec | 24 ++++++----- 5 files changed, 103 insertions(+), 77 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7ef1c95fb3d..3cec1855609 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.139 2011/08/07 23:44:55 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.136 2011/08/07 15:07:44 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } + $CHOOSEDTARGET{$key}=1; } } } @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } + if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,6 +518,21 @@ if ($nboftargetok) { $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"`; + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; @@ -579,9 +594,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } @@ -615,8 +627,6 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -824,7 +834,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 87da5c20a4c..cb3cfb4db43 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__%{?dist} 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build Group: Applications/Internet + 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) AutoReqProv: no @@ -90,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{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/htdocs @@ -113,15 +117,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9b873d674f4..87ba28cc946 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,18 +21,18 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet + # Requires for Fedora-Redhat -Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap -Requires: php-mysql >= 4.1.0 +Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # 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 for Mandriva-Mageia @@ -122,37 +124,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* -#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK -#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT -#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE -#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR -#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU -#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB -#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ -#lang(en) %_datadir/dolibarr/htdocs/langs/en_US -#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR -#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES -#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN -#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX -#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH -#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* +#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK +#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT +#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE +#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR +#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU +#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB +#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ +#lang(en) /usr/share/dolibarr/htdocs/langs/en_US +#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR +#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES +#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN +#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX +#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH +#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php @@ -227,8 +229,10 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr + #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 79df79dcf40..7341ab17fc9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -112,15 +116,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f785d3f41b1..c26b42651f9 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -111,15 +115,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From d4cc6054ef3db35567bc0ef491d472ed5df5bbc4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:17:14 +0000 Subject: [PATCH 04/88] Work on package --- build/makepack-dolibarr.pl | 23 ++++------------------- build/rpm/dolibarr_fedora.spec | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 3cec1855609..16aaca197c1 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.136 2011/08/07 15:07:44 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.137 2011/08/07 15:17:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } + 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; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $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"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,21 +518,6 @@ if ($nboftargetok) { $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"`; - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index cb3cfb4db43..a1efafc8e80 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -94,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{__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/htdocs From c7630ffb1a1e7b5c6398e99c533418df760f5ad2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:29:00 +0000 Subject: [PATCH 05/88] Works on windows package From 116df43727ca443b45b6ff2ee042a743b1f5e9e2 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 16:36:45 +0000 Subject: [PATCH 06/88] some css3 enhancement for eldy menu --- htdocs/theme/eldy/style.css.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7a2f0d52a8a..a71f71e1776 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ + * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,14 +270,32 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border-radius: 6px 6px 0px 0px; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 2px solid #dee7ec; + border-bottom: 1px solid #dee7ec; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:active { background: #F4F4F4; @@ -289,10 +307,19 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + -moz-box-shadow: 2px 0px 4px #0C0C0C; + -webkit-box-shadow: 2px 0px 4px #0C0C0C; + box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; + border-bottom: 1px solid #F4F4F4; white-space: nowrap; } From 54c14ffbd2d2e90c9adb3686c91048f924c80d45 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:37:45 +0000 Subject: [PATCH 07/88] Works on windows package From 0bbc39109d7efdeccc3345a3517ea8b9f6fdba77 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 17:54:36 +0000 Subject: [PATCH 08/88] fix : shadow for main boxes on home page --- htdocs/theme/eldy/style.css.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a71f71e1776..57b816d40cc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ + * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1091,6 +1091,15 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; + +box-shadow: 4px 4px 4px #CCC; + } table.noborder tr { @@ -1108,6 +1117,7 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ + } table.nobordernopadding { From 996733f2636ab8204bd27ada9ad251fa9af21a4a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:01:14 +0000 Subject: [PATCH 09/88] Work on package --- build/makepack-dolibarr.pl | 7 +++++-- build/rpm/dolibarr_fedora.spec | 10 +++------- build/rpm/dolibarr_generic.spec | 11 +++-------- build/rpm/dolibarr_mandriva.spec | 10 +++------- build/rpm/dolibarr_opensuse.spec | 10 +++------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 16aaca197c1..c5e40bcfd36 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.137 2011/08/07 15:17:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -579,6 +579,9 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a1efafc8e80..95104674ce2 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__%{?dist} 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - 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) AutoReqProv: no diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 87ba28cc946..d7740f5bc29 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,15 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse @@ -229,10 +226,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr - #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7341ab17fc9..6e9ae710589 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c26b42651f9..6ffc9df8692 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no From 9b9908448b97ae9139759d05ea65c163ec4cc994 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:20:57 +0000 Subject: [PATCH 10/88] Work on package --- build/rpm/dolibarr_fedora.spec | 14 ++++---- build/rpm/dolibarr_generic.spec | 61 ++++++++++++++++---------------- build/rpm/dolibarr_mandriva.spec | 14 ++++---- build/rpm/dolibarr_opensuse.spec | 14 ++++---- 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 95104674ce2..87da5c20a4c 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -113,15 +113,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index d7740f5bc29..9b873d674f4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -29,7 +29,8 @@ Group: Networking/WWW # For all other distrib Group: Applications/Internet # 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: 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 @@ -121,37 +122,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* -#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK -#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT -#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE -#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR -#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU -#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB -#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ -#lang(en) /usr/share/dolibarr/htdocs/langs/en_US -#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR -#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES -#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN -#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX -#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH -#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* +#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK +#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT +#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE +#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR +#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU +#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB +#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ +#lang(en) %_datadir/dolibarr/htdocs/langs/en_US +#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR +#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES +#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN +#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX +#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH +#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 6e9ae710589..79df79dcf40 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -112,15 +112,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 6ffc9df8692..f785d3f41b1 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -111,15 +111,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From 8b9d4c488e2b2ba01ec8a5f1468625f0f6ac1fd7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:52:45 +0000 Subject: [PATCH 11/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 101 +++++++------------------------- 1 file changed, 21 insertions(+), 80 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 57b816d40cc..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,32 +269,14 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border-radius: 6px 6px 0px 0px; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 1px solid #dee7ec; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; + border-bottom: 2px solid #dee7ec; } a.tmenu:active { background: #F4F4F4; @@ -307,19 +288,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -moz-box-shadow: 2px 0px 4px #0C0C0C; - -webkit-box-shadow: 2px 0px 4px #0C0C0C; - box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 1px solid #F4F4F4; + border-bottom: 2px solid #F4F4F4; white-space: nowrap; } @@ -843,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -883,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -899,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -915,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -931,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -959,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1091,15 +1059,6 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; - -box-shadow: 4px 4px 4px #CCC; - } table.noborder tr { @@ -1117,7 +1076,6 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ - } table.nobordernopadding { @@ -1251,17 +1209,8 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - - } - .box { padding-right: 0px; padding-left: 0px; @@ -1278,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1318,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1329,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1341,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1436,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1459,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1557,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 9d899faf3ac633de74180157da5baf9620273351 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:58:48 +0000 Subject: [PATCH 12/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 52d6791b7e2..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin + * Copyright (C) 2011 Philippe Grand * * 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 @@ -20,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 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 @@ -815,10 +816,9 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; - -moz-border-radius-bottomleft:6px; - -moz-border-radius-bottomright:6px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,8 +856,9 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -871,8 +872,9 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -886,8 +888,9 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -901,8 +904,9 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -928,8 +932,9 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1211,6 +1216,7 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } + .box { padding-right: 0px; padding-left: 0px; @@ -1227,8 +1233,6 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; } tr.box_impair { @@ -1269,6 +1273,8 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #efefd4; } @@ -1278,6 +1284,8 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #EFCFCF; } @@ -1288,6 +1296,8 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; background: #efefd4; } @@ -1381,6 +1391,8 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; } @@ -1402,7 +1414,9 @@ opacity: 1; } .bodyline { - -moz-border-radius:8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1498,7 +1512,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 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-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 6499829c1adb5db9686f4392905857e121f12849 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH 13/88] Work on package --- build/makepack-dolibarr.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 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.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%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) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # 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"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From 0b8859924ab14e74eaa1410a80ffcaafa698abfb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH 14/88] Work on package From 372b00d7384ace5a32c0127f082cc0f5aa0cb79a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH 15/88] Fix: Do not close automatically deposits From a534ce9b881aa07629f6b3c25a44e88200f235f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:01:45 +0000 Subject: [PATCH 16/88] Fix: Do not close automatically deposits From 3a5b44f177b3ecf2594dbbdebaf011ffc4e8c3de Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:10:07 +0000 Subject: [PATCH 17/88] Fix: Use short instead of long labels From 0bcf92d5c62aec725713fd97ef6fb313bed3772d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:53:25 +0000 Subject: [PATCH 18/88] Fix: When a line is defined as option, it was not possible to remove "options" then. From efb1accc47aa9ff34ba8f99c6f02fe9c73ba79f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 13:10:26 +0000 Subject: [PATCH 19/88] Work on rpm package From 296527c945cfa84e3176a9e7d17cdd0671bf29d4 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 15:06:23 +0000 Subject: [PATCH 20/88] =?UTF-8?q?fix=20some=20issues=20and=20get=20compati?= =?UTF-8?q?ble=20with=20:=20Saf3-4,=20iOS=201-3.2,=20Android=20<1.6=20Oper?= =?UTF-8?q?a=2010.5,=20IE9,=20Saf5,=20Chrome,=20FF4,=20iOS=204,=20Android?= =?UTF-8?q?=202.1+=20and=20IE6=96IE9=20for=20shadow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/theme/eldy/style.css.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..7a2f0d52a8a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1214,6 +1214,14 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + } From 3d5049074d4370c60878ebe8ca5e1b3704dc9587 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:07:44 +0000 Subject: [PATCH 21/88] Work on package --- build/makepack-dolibarr.pl | 34 +++++++++------ build/rpm/dolibarr_fedora.spec | 26 +++++++----- build/rpm/dolibarr_generic.spec | 72 +++++++++++++++++--------------- build/rpm/dolibarr_mandriva.spec | 24 ++++++----- build/rpm/dolibarr_opensuse.spec | 24 ++++++----- 5 files changed, 103 insertions(+), 77 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7ef1c95fb3d..3cec1855609 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.139 2011/08/07 23:44:55 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.136 2011/08/07 15:07:44 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } + $CHOOSEDTARGET{$key}=1; } } } @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } + if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,6 +518,21 @@ if ($nboftargetok) { $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"`; + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; @@ -579,9 +594,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } @@ -615,8 +627,6 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -824,7 +834,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 87da5c20a4c..cb3cfb4db43 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__%{?dist} 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build Group: Applications/Internet + 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) AutoReqProv: no @@ -90,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{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/htdocs @@ -113,15 +117,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9b873d674f4..87ba28cc946 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,18 +21,18 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet + # Requires for Fedora-Redhat -Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap -Requires: php-mysql >= 4.1.0 +Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # 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 for Mandriva-Mageia @@ -122,37 +124,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* -#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK -#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT -#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE -#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR -#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU -#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB -#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ -#lang(en) %_datadir/dolibarr/htdocs/langs/en_US -#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR -#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES -#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN -#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX -#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH -#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* +#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK +#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT +#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE +#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR +#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU +#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB +#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ +#lang(en) /usr/share/dolibarr/htdocs/langs/en_US +#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR +#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES +#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN +#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX +#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH +#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php @@ -227,8 +229,10 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr + #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 79df79dcf40..7341ab17fc9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -112,15 +116,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f785d3f41b1..c26b42651f9 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -111,15 +115,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From 613443d57c7765537b2c2e02e2064937dd4d9b10 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:17:14 +0000 Subject: [PATCH 22/88] Work on package --- build/makepack-dolibarr.pl | 23 ++++------------------- build/rpm/dolibarr_fedora.spec | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 3cec1855609..16aaca197c1 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.136 2011/08/07 15:07:44 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.137 2011/08/07 15:17:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } + 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; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $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"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,21 +518,6 @@ if ($nboftargetok) { $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"`; - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index cb3cfb4db43..a1efafc8e80 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -94,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{__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/htdocs From 93642f8c3828b13a624df657f14dd01d4fc86ece Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:29:00 +0000 Subject: [PATCH 23/88] Works on windows package From 13de49fcbefcd39c40dbec32bb17bebfc2bcb821 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 16:36:45 +0000 Subject: [PATCH 24/88] some css3 enhancement for eldy menu --- htdocs/theme/eldy/style.css.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7a2f0d52a8a..a71f71e1776 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ + * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,14 +270,32 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border-radius: 6px 6px 0px 0px; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 2px solid #dee7ec; + border-bottom: 1px solid #dee7ec; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:active { background: #F4F4F4; @@ -289,10 +307,19 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + -moz-box-shadow: 2px 0px 4px #0C0C0C; + -webkit-box-shadow: 2px 0px 4px #0C0C0C; + box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; + border-bottom: 1px solid #F4F4F4; white-space: nowrap; } From 4efebb4c0bd9c9403ea349a9c8f6375765370f59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:37:45 +0000 Subject: [PATCH 25/88] Works on windows package From 1f85f407991a22c9ccaee2856395977534923dd3 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 17:54:36 +0000 Subject: [PATCH 26/88] fix : shadow for main boxes on home page --- htdocs/theme/eldy/style.css.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a71f71e1776..57b816d40cc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ + * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1091,6 +1091,15 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; + +box-shadow: 4px 4px 4px #CCC; + } table.noborder tr { @@ -1108,6 +1117,7 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ + } table.nobordernopadding { From 75eece206f80cfbf253e4ad662746d263aab2313 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:01:14 +0000 Subject: [PATCH 27/88] Work on package --- build/makepack-dolibarr.pl | 7 +++++-- build/rpm/dolibarr_fedora.spec | 10 +++------- build/rpm/dolibarr_generic.spec | 11 +++-------- build/rpm/dolibarr_mandriva.spec | 10 +++------- build/rpm/dolibarr_opensuse.spec | 10 +++------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 16aaca197c1..c5e40bcfd36 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.137 2011/08/07 15:17:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -579,6 +579,9 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a1efafc8e80..95104674ce2 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__%{?dist} 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - 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) AutoReqProv: no diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 87ba28cc946..d7740f5bc29 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,15 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse @@ -229,10 +226,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr - #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7341ab17fc9..6e9ae710589 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c26b42651f9..6ffc9df8692 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no From 9f60b2444fe9eacdeaaf54a27a166079e781c132 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:20:57 +0000 Subject: [PATCH 28/88] Work on package --- build/rpm/dolibarr_fedora.spec | 14 ++++---- build/rpm/dolibarr_generic.spec | 61 ++++++++++++++++---------------- build/rpm/dolibarr_mandriva.spec | 14 ++++---- build/rpm/dolibarr_opensuse.spec | 14 ++++---- 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 95104674ce2..87da5c20a4c 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -113,15 +113,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index d7740f5bc29..9b873d674f4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -29,7 +29,8 @@ Group: Networking/WWW # For all other distrib Group: Applications/Internet # 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: 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 @@ -121,37 +122,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* -#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK -#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT -#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE -#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR -#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU -#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB -#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ -#lang(en) /usr/share/dolibarr/htdocs/langs/en_US -#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR -#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES -#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN -#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX -#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH -#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* +#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK +#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT +#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE +#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR +#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU +#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB +#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ +#lang(en) %_datadir/dolibarr/htdocs/langs/en_US +#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR +#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES +#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN +#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX +#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH +#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 6e9ae710589..79df79dcf40 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -112,15 +112,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 6ffc9df8692..f785d3f41b1 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -111,15 +111,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From cddb7de871ed4f13112523ae092778083a4672c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:52:45 +0000 Subject: [PATCH 29/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 101 +++++++------------------------- 1 file changed, 21 insertions(+), 80 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 57b816d40cc..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,32 +269,14 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border-radius: 6px 6px 0px 0px; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 1px solid #dee7ec; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; + border-bottom: 2px solid #dee7ec; } a.tmenu:active { background: #F4F4F4; @@ -307,19 +288,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -moz-box-shadow: 2px 0px 4px #0C0C0C; - -webkit-box-shadow: 2px 0px 4px #0C0C0C; - box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 1px solid #F4F4F4; + border-bottom: 2px solid #F4F4F4; white-space: nowrap; } @@ -843,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -883,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -899,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -915,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -931,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -959,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1091,15 +1059,6 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; - -box-shadow: 4px 4px 4px #CCC; - } table.noborder tr { @@ -1117,7 +1076,6 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ - } table.nobordernopadding { @@ -1251,17 +1209,8 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - - } - .box { padding-right: 0px; padding-left: 0px; @@ -1278,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1318,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1329,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1341,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1436,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1459,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1557,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 95f7166a24b9e94dbc62af8740acbd22f4e75eba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:58:48 +0000 Subject: [PATCH 30/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 52d6791b7e2..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin + * Copyright (C) 2011 Philippe Grand * * 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 @@ -20,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 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 @@ -815,10 +816,9 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; - -moz-border-radius-bottomleft:6px; - -moz-border-radius-bottomright:6px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,8 +856,9 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -871,8 +872,9 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -886,8 +888,9 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -901,8 +904,9 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -928,8 +932,9 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1211,6 +1216,7 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } + .box { padding-right: 0px; padding-left: 0px; @@ -1227,8 +1233,6 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; } tr.box_impair { @@ -1269,6 +1273,8 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #efefd4; } @@ -1278,6 +1284,8 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #EFCFCF; } @@ -1288,6 +1296,8 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; background: #efefd4; } @@ -1381,6 +1391,8 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; } @@ -1402,7 +1414,9 @@ opacity: 1; } .bodyline { - -moz-border-radius:8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1498,7 +1512,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 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-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 3762e163e9e62b0c0705da349a30ebdd59f799a3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH 31/88] Work on package --- build/makepack-dolibarr.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 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.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%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) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # 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"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From e693a816c52f6bea4dd538d03e504e6596b19955 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH 32/88] Work on package From 7a35496325f241fffdea64ada619176e210d56cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH 33/88] Fix: Do not close automatically deposits From 03a93caad3a27b67196209f5a907fd5ea8ac0940 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:01:45 +0000 Subject: [PATCH 34/88] Fix: Do not close automatically deposits From 77015bd4150a32b454df3c0330889011bae63b09 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:10:07 +0000 Subject: [PATCH 35/88] Fix: Use short instead of long labels From 83ea614d46b35f1562ba8f90b47a8489e2cf282a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:53:25 +0000 Subject: [PATCH 36/88] Fix: When a line is defined as option, it was not possible to remove "options" then. From 532573bbeaa0280638ce3f17e000a8cb1a0f79c3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 13:10:26 +0000 Subject: [PATCH 37/88] Work on rpm package From bbf9a77e8d378d517786ec71553517cc90f4aff6 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 15:06:23 +0000 Subject: [PATCH 38/88] =?UTF-8?q?fix=20some=20issues=20and=20get=20compati?= =?UTF-8?q?ble=20with=20:=20Saf3-4,=20iOS=201-3.2,=20Android=20<1.6=20Oper?= =?UTF-8?q?a=2010.5,=20IE9,=20Saf5,=20Chrome,=20FF4,=20iOS=204,=20Android?= =?UTF-8?q?=202.1+=20and=20IE6=96IE9=20for=20shadow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/theme/eldy/style.css.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..7a2f0d52a8a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1214,6 +1214,14 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + } From 9293867b9b4025dbbe9fac1779515e7005e749e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:07:44 +0000 Subject: [PATCH 39/88] Work on package --- build/makepack-dolibarr.pl | 34 +++++++++------ build/rpm/dolibarr_fedora.spec | 26 +++++++----- build/rpm/dolibarr_generic.spec | 72 +++++++++++++++++--------------- build/rpm/dolibarr_mandriva.spec | 24 ++++++----- build/rpm/dolibarr_opensuse.spec | 24 ++++++----- 5 files changed, 103 insertions(+), 77 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7ef1c95fb3d..3cec1855609 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.139 2011/08/07 23:44:55 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.136 2011/08/07 15:07:44 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } + $CHOOSEDTARGET{$key}=1; } } } @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } + if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,6 +518,21 @@ if ($nboftargetok) { $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"`; + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; @@ -579,9 +594,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } @@ -615,8 +627,6 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -824,7 +834,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 87da5c20a4c..cb3cfb4db43 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__%{?dist} 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build Group: Applications/Internet + 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) AutoReqProv: no @@ -90,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{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/htdocs @@ -113,15 +117,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9b873d674f4..87ba28cc946 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,18 +21,18 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet + # Requires for Fedora-Redhat -Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap -Requires: php-mysql >= 4.1.0 +Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # 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 for Mandriva-Mageia @@ -122,37 +124,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* -#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK -#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT -#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE -#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR -#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU -#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB -#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ -#lang(en) %_datadir/dolibarr/htdocs/langs/en_US -#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR -#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES -#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN -#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX -#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH -#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* +#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK +#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT +#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE +#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR +#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU +#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB +#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ +#lang(en) /usr/share/dolibarr/htdocs/langs/en_US +#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR +#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES +#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN +#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX +#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH +#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php @@ -227,8 +229,10 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr + #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 79df79dcf40..7341ab17fc9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -112,15 +116,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f785d3f41b1..c26b42651f9 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -111,15 +115,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From b349ef459aa2553d8f6156d07ca7fab67f1fab63 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:17:14 +0000 Subject: [PATCH 40/88] Work on package --- build/makepack-dolibarr.pl | 23 ++++------------------- build/rpm/dolibarr_fedora.spec | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 3cec1855609..16aaca197c1 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.136 2011/08/07 15:07:44 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.137 2011/08/07 15:17:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } + 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; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $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"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,21 +518,6 @@ if ($nboftargetok) { $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"`; - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index cb3cfb4db43..a1efafc8e80 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -94,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{__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/htdocs From 0caa4da2124648f1427d8200cd97a6df5aaf5d59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:29:00 +0000 Subject: [PATCH 41/88] Works on windows package From 8def6dd06d22ad4c6e8797c5b53d11e52809a0d6 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 16:36:45 +0000 Subject: [PATCH 42/88] some css3 enhancement for eldy menu --- htdocs/theme/eldy/style.css.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7a2f0d52a8a..a71f71e1776 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ + * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,14 +270,32 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border-radius: 6px 6px 0px 0px; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 2px solid #dee7ec; + border-bottom: 1px solid #dee7ec; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:active { background: #F4F4F4; @@ -289,10 +307,19 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + -moz-box-shadow: 2px 0px 4px #0C0C0C; + -webkit-box-shadow: 2px 0px 4px #0C0C0C; + box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; + border-bottom: 1px solid #F4F4F4; white-space: nowrap; } From b02793e52abab7c4a7676a73ba8df10f60b73b28 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:37:45 +0000 Subject: [PATCH 43/88] Works on windows package From 08f0be7694d0ecc25a105a1b12ff5e9e550f30da Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 17:54:36 +0000 Subject: [PATCH 44/88] fix : shadow for main boxes on home page --- htdocs/theme/eldy/style.css.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a71f71e1776..57b816d40cc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ + * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1091,6 +1091,15 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; + +box-shadow: 4px 4px 4px #CCC; + } table.noborder tr { @@ -1108,6 +1117,7 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ + } table.nobordernopadding { From 62b60665477329ad6f7ca432124d88c4487b703c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:01:14 +0000 Subject: [PATCH 45/88] Work on package --- build/makepack-dolibarr.pl | 7 +++++-- build/rpm/dolibarr_fedora.spec | 10 +++------- build/rpm/dolibarr_generic.spec | 11 +++-------- build/rpm/dolibarr_mandriva.spec | 10 +++------- build/rpm/dolibarr_opensuse.spec | 10 +++------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 16aaca197c1..c5e40bcfd36 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.137 2011/08/07 15:17:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -579,6 +579,9 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a1efafc8e80..95104674ce2 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__%{?dist} 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - 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) AutoReqProv: no diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 87ba28cc946..d7740f5bc29 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,15 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse @@ -229,10 +226,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr - #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7341ab17fc9..6e9ae710589 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c26b42651f9..6ffc9df8692 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no From e339384293802f1af861d6ca70dd620fca4fbd62 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:20:57 +0000 Subject: [PATCH 46/88] Work on package --- build/rpm/dolibarr_fedora.spec | 14 ++++---- build/rpm/dolibarr_generic.spec | 61 ++++++++++++++++---------------- build/rpm/dolibarr_mandriva.spec | 14 ++++---- build/rpm/dolibarr_opensuse.spec | 14 ++++---- 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 95104674ce2..87da5c20a4c 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -113,15 +113,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index d7740f5bc29..9b873d674f4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -29,7 +29,8 @@ Group: Networking/WWW # For all other distrib Group: Applications/Internet # 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: 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 @@ -121,37 +122,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* -#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK -#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT -#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE -#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR -#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU -#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB -#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ -#lang(en) /usr/share/dolibarr/htdocs/langs/en_US -#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR -#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES -#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN -#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX -#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH -#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* +#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK +#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT +#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE +#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR +#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU +#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB +#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ +#lang(en) %_datadir/dolibarr/htdocs/langs/en_US +#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR +#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES +#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN +#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX +#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH +#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 6e9ae710589..79df79dcf40 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -112,15 +112,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 6ffc9df8692..f785d3f41b1 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -111,15 +111,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From 0ee08ea0a4c11528d43a8036e685301180313292 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:52:45 +0000 Subject: [PATCH 47/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 101 +++++++------------------------- 1 file changed, 21 insertions(+), 80 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 57b816d40cc..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,32 +269,14 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border-radius: 6px 6px 0px 0px; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 1px solid #dee7ec; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; + border-bottom: 2px solid #dee7ec; } a.tmenu:active { background: #F4F4F4; @@ -307,19 +288,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -moz-box-shadow: 2px 0px 4px #0C0C0C; - -webkit-box-shadow: 2px 0px 4px #0C0C0C; - box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 1px solid #F4F4F4; + border-bottom: 2px solid #F4F4F4; white-space: nowrap; } @@ -843,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -883,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -899,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -915,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -931,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -959,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1091,15 +1059,6 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; - -box-shadow: 4px 4px 4px #CCC; - } table.noborder tr { @@ -1117,7 +1076,6 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ - } table.nobordernopadding { @@ -1251,17 +1209,8 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - - } - .box { padding-right: 0px; padding-left: 0px; @@ -1278,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1318,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1329,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1341,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1436,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1459,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1557,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 956c15d9b18026155571c4cc0cfa11b575fb5286 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:58:48 +0000 Subject: [PATCH 48/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 52d6791b7e2..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin + * Copyright (C) 2011 Philippe Grand * * 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 @@ -20,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 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 @@ -815,10 +816,9 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; - -moz-border-radius-bottomleft:6px; - -moz-border-radius-bottomright:6px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,8 +856,9 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -871,8 +872,9 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -886,8 +888,9 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -901,8 +904,9 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -928,8 +932,9 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1211,6 +1216,7 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } + .box { padding-right: 0px; padding-left: 0px; @@ -1227,8 +1233,6 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; } tr.box_impair { @@ -1269,6 +1273,8 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #efefd4; } @@ -1278,6 +1284,8 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #EFCFCF; } @@ -1288,6 +1296,8 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; background: #efefd4; } @@ -1381,6 +1391,8 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; } @@ -1402,7 +1414,9 @@ opacity: 1; } .bodyline { - -moz-border-radius:8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1498,7 +1512,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 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-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 4e7d72a187ba19643fcb8a713bbec72e20c6977c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH 49/88] Work on package --- build/makepack-dolibarr.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 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.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%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) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # 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"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From 44a4b086a930b93c5e197ec011415b6c6add4fce Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH 50/88] Work on package From e064ddc554e41a42f4ee8212300bfcc4300c2155 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH 51/88] Fix: Do not close automatically deposits From 672dc167583de0e0b790f90e0322539e081c920c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:01:45 +0000 Subject: [PATCH 52/88] Fix: Do not close automatically deposits From 1b13a7d5d01fa0f977882bef6e400830983e7c3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:10:07 +0000 Subject: [PATCH 53/88] Fix: Use short instead of long labels From 188c61070d037f41f28e797651dca8e27ffad5f8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:53:25 +0000 Subject: [PATCH 54/88] Fix: When a line is defined as option, it was not possible to remove "options" then. From 5228cd4991cb2fa4467cb5a54c60142ed7d96e24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 13:10:26 +0000 Subject: [PATCH 55/88] Work on rpm package From 1ff7ea642e35b70c462b5157798bafbf45e08117 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 15:06:23 +0000 Subject: [PATCH 56/88] =?UTF-8?q?fix=20some=20issues=20and=20get=20compati?= =?UTF-8?q?ble=20with=20:=20Saf3-4,=20iOS=201-3.2,=20Android=20<1.6=20Oper?= =?UTF-8?q?a=2010.5,=20IE9,=20Saf5,=20Chrome,=20FF4,=20iOS=204,=20Android?= =?UTF-8?q?=202.1+=20and=20IE6=96IE9=20for=20shadow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/theme/eldy/style.css.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..7a2f0d52a8a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1214,6 +1214,14 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + } From dfaffaf93c11c85c193010e392753a5a94b5f2f8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:07:44 +0000 Subject: [PATCH 57/88] Work on package --- build/makepack-dolibarr.pl | 34 +++++++++------ build/rpm/dolibarr_fedora.spec | 26 +++++++----- build/rpm/dolibarr_generic.spec | 72 +++++++++++++++++--------------- build/rpm/dolibarr_mandriva.spec | 24 ++++++----- build/rpm/dolibarr_opensuse.spec | 24 ++++++----- 5 files changed, 103 insertions(+), 77 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7ef1c95fb3d..3cec1855609 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.139 2011/08/07 23:44:55 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.136 2011/08/07 15:07:44 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } + $CHOOSEDTARGET{$key}=1; } } } @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } + if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,6 +518,21 @@ if ($nboftargetok) { $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"`; + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; @@ -579,9 +594,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } @@ -615,8 +627,6 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -824,7 +834,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 87da5c20a4c..cb3cfb4db43 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__%{?dist} 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build Group: Applications/Internet + 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) AutoReqProv: no @@ -90,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{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/htdocs @@ -113,15 +117,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9b873d674f4..87ba28cc946 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,18 +21,18 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet + # Requires for Fedora-Redhat -Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap -Requires: php-mysql >= 4.1.0 +Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # 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 for Mandriva-Mageia @@ -122,37 +124,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* -#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK -#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT -#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE -#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR -#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU -#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB -#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ -#lang(en) %_datadir/dolibarr/htdocs/langs/en_US -#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR -#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES -#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN -#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX -#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH -#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* +#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK +#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT +#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE +#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR +#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU +#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB +#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ +#lang(en) /usr/share/dolibarr/htdocs/langs/en_US +#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR +#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES +#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN +#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX +#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH +#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php @@ -227,8 +229,10 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr + #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 79df79dcf40..7341ab17fc9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -112,15 +116,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f785d3f41b1..c26b42651f9 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -111,15 +115,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From afbeca78cf9ebf1393d799bbd25c4368c3310520 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:17:14 +0000 Subject: [PATCH 58/88] Work on package --- build/makepack-dolibarr.pl | 23 ++++------------------- build/rpm/dolibarr_fedora.spec | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 3cec1855609..16aaca197c1 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.136 2011/08/07 15:07:44 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.137 2011/08/07 15:17:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } + 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; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $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"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,21 +518,6 @@ if ($nboftargetok) { $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"`; - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index cb3cfb4db43..a1efafc8e80 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -94,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{__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/htdocs From fd3f283fc64b98d56ace8723d9ab7c19ffe01ada Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:29:00 +0000 Subject: [PATCH 59/88] Works on windows package From ae778991689d233b323cd049796ed3b622782369 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 16:36:45 +0000 Subject: [PATCH 60/88] some css3 enhancement for eldy menu --- htdocs/theme/eldy/style.css.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7a2f0d52a8a..a71f71e1776 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.90 2011/08/07 15:06:23 grandoc Exp $ + * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,14 +270,32 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border-radius: 6px 6px 0px 0px; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 2px solid #dee7ec; + border-bottom: 1px solid #dee7ec; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:active { background: #F4F4F4; @@ -289,10 +307,19 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + -moz-box-shadow: 2px 0px 4px #0C0C0C; + -webkit-box-shadow: 2px 0px 4px #0C0C0C; + box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; + border-bottom: 1px solid #F4F4F4; white-space: nowrap; } From fd1c23e689394b2bbd491b81181d0990864f482b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:37:45 +0000 Subject: [PATCH 61/88] Works on windows package From 96bbb6b4672bad3fa085f0c584904bba8b15c5a8 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 17:54:36 +0000 Subject: [PATCH 62/88] fix : shadow for main boxes on home page --- htdocs/theme/eldy/style.css.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a71f71e1776..57b816d40cc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ + * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1091,6 +1091,15 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; + +box-shadow: 4px 4px 4px #CCC; + } table.noborder tr { @@ -1108,6 +1117,7 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ + } table.nobordernopadding { From a7491579be80ecc19863bb155880520fcca82095 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:01:14 +0000 Subject: [PATCH 63/88] Work on package --- build/makepack-dolibarr.pl | 7 +++++-- build/rpm/dolibarr_fedora.spec | 10 +++------- build/rpm/dolibarr_generic.spec | 11 +++-------- build/rpm/dolibarr_mandriva.spec | 10 +++------- build/rpm/dolibarr_opensuse.spec | 10 +++------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 16aaca197c1..c5e40bcfd36 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.137 2011/08/07 15:17:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -579,6 +579,9 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a1efafc8e80..95104674ce2 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__%{?dist} 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - 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) AutoReqProv: no diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 87ba28cc946..d7740f5bc29 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,15 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse @@ -229,10 +226,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr - #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7341ab17fc9..6e9ae710589 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c26b42651f9..6ffc9df8692 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no From d0ceba75bbf38b7b596201ab69ee73afb57df1bc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:20:57 +0000 Subject: [PATCH 64/88] Work on package --- build/rpm/dolibarr_fedora.spec | 14 ++++---- build/rpm/dolibarr_generic.spec | 61 ++++++++++++++++---------------- build/rpm/dolibarr_mandriva.spec | 14 ++++---- build/rpm/dolibarr_opensuse.spec | 14 ++++---- 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 95104674ce2..87da5c20a4c 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -113,15 +113,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index d7740f5bc29..9b873d674f4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -29,7 +29,8 @@ Group: Networking/WWW # For all other distrib Group: Applications/Internet # 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: 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 @@ -121,37 +122,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* -#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK -#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT -#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE -#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR -#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU -#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB -#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ -#lang(en) /usr/share/dolibarr/htdocs/langs/en_US -#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR -#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES -#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN -#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX -#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH -#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* +#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK +#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT +#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE +#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR +#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU +#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB +#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ +#lang(en) %_datadir/dolibarr/htdocs/langs/en_US +#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR +#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES +#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN +#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX +#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH +#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 6e9ae710589..79df79dcf40 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -112,15 +112,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 6ffc9df8692..f785d3f41b1 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -111,15 +111,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From 8b5309e4a6a356310e7f72439cef3fc362e104b5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:52:45 +0000 Subject: [PATCH 65/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 101 +++++++------------------------- 1 file changed, 21 insertions(+), 80 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 57b816d40cc..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,32 +269,14 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border-radius: 6px 6px 0px 0px; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 1px solid #dee7ec; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; + border-bottom: 2px solid #dee7ec; } a.tmenu:active { background: #F4F4F4; @@ -307,19 +288,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -moz-box-shadow: 2px 0px 4px #0C0C0C; - -webkit-box-shadow: 2px 0px 4px #0C0C0C; - box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 1px solid #F4F4F4; + border-bottom: 2px solid #F4F4F4; white-space: nowrap; } @@ -843,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -883,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -899,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -915,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -931,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -959,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1091,15 +1059,6 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; - -box-shadow: 4px 4px 4px #CCC; - } table.noborder tr { @@ -1117,7 +1076,6 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ - } table.nobordernopadding { @@ -1251,17 +1209,8 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - - } - .box { padding-right: 0px; padding-left: 0px; @@ -1278,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1318,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1329,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1341,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1436,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1459,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1557,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 812073a53f3fbeefc0e6259c5119684bcd720bdb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:58:48 +0000 Subject: [PATCH 66/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 52d6791b7e2..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin + * Copyright (C) 2011 Philippe Grand * * 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 @@ -20,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 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 @@ -815,10 +816,9 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; - -moz-border-radius-bottomleft:6px; - -moz-border-radius-bottomright:6px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,8 +856,9 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -871,8 +872,9 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -886,8 +888,9 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -901,8 +904,9 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -928,8 +932,9 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1211,6 +1216,7 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } + .box { padding-right: 0px; padding-left: 0px; @@ -1227,8 +1233,6 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; } tr.box_impair { @@ -1269,6 +1273,8 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #efefd4; } @@ -1278,6 +1284,8 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #EFCFCF; } @@ -1288,6 +1296,8 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; background: #efefd4; } @@ -1381,6 +1391,8 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; } @@ -1402,7 +1414,9 @@ opacity: 1; } .bodyline { - -moz-border-radius:8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1498,7 +1512,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 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-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From ed77f831510b7cc281ecc74ec314b91d0017bf3d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH 67/88] Work on package --- build/makepack-dolibarr.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 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.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%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) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # 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"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From 2f4b33393dd4c11593b241c26ed555b897c95e9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH 68/88] Work on package From 8ce9ac1b8ef90b6611c88af06de0cd60e22cc07a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH 69/88] Fix: Do not close automatically deposits From a32d100c214fce6eb82f03a29ef5e7c085c9c436 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:01:45 +0000 Subject: [PATCH 70/88] Fix: Do not close automatically deposits From 9728b03817ae09bdc5cbfa6110699a1fbbb37673 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:10:07 +0000 Subject: [PATCH 71/88] Fix: Use short instead of long labels From 54290ab3f4e3de2d6bb744892b323f5272d91924 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:53:25 +0000 Subject: [PATCH 72/88] Fix: When a line is defined as option, it was not possible to remove "options" then. From 2efae38426f546d146efcc03e14143ee57a5a783 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:07:44 +0000 Subject: [PATCH 73/88] Work on package --- build/makepack-dolibarr.pl | 34 +++++++++------ build/rpm/dolibarr_fedora.spec | 26 +++++++----- build/rpm/dolibarr_generic.spec | 72 +++++++++++++++++--------------- build/rpm/dolibarr_mandriva.spec | 24 ++++++----- build/rpm/dolibarr_opensuse.spec | 24 ++++++----- 5 files changed, 103 insertions(+), 77 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7ef1c95fb3d..3cec1855609 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.139 2011/08/07 23:44:55 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.136 2011/08/07 15:07:44 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } + $CHOOSEDTARGET{$key}=1; } } } @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; } + if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; } if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; } if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - # Conf files + # Apache conf files print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,6 +518,21 @@ if ($nboftargetok) { $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"`; + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; @@ -579,9 +594,6 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } @@ -615,8 +627,6 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -824,7 +834,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 87da5c20a4c..cb3cfb4db43 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__%{?dist} 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build Group: Applications/Internet + 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) AutoReqProv: no @@ -90,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{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/htdocs @@ -113,15 +117,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9b873d674f4..87ba28cc946 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,18 +21,18 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet + # Requires for Fedora-Redhat -Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap -Requires: php-mysql >= 4.1.0 +Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # 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 for Mandriva-Mageia @@ -122,37 +124,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* -#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK -#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT -#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE -#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR -#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU -#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB -#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ -#lang(en) %_datadir/dolibarr/htdocs/langs/en_US -#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR -#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES -#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN -#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX -#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH -#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* +#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK +#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT +#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE +#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR +#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU +#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB +#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ +#lang(en) /usr/share/dolibarr/htdocs/langs/en_US +#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR +#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES +#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN +#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX +#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH +#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php @@ -227,8 +229,10 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr + #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 79df79dcf40..7341ab17fc9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -112,15 +116,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index f785d3f41b1..c26b42651f9 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,8 +6,10 @@ # edit it if you need to match your rules. # -------------------------------------------------------- +%define version __VERSION__ + Name: dolibarr -Version: __VERSION__ +Version: %{version} Release: __RELEASE__ 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 @@ -19,14 +21,16 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz +Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/dolibarr-%{version}-build 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -111,15 +115,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr -%dir %_datadir/dolibarr/build -%dir %_datadir/dolibarr/htdocs -%dir %_datadir/dolibarr/scripts +%doc /usr/share/doc/dolibarr +%dir /usr/share/dolibarr/build +%dir /usr/share/dolibarr/htdocs +%dir /usr/share/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -%_datadir/dolibarr/build/* -%_datadir/dolibarr/htdocs/* -%_datadir/dolibarr/scripts/* +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From f0e5e6f4bb5c1811bb3566bea1fc14bc3b8f1c69 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 15:17:14 +0000 Subject: [PATCH 74/88] Work on package --- build/makepack-dolibarr.pl | 23 ++++------------------- build/rpm/dolibarr_fedora.spec | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 3cec1855609..16aaca197c1 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.136 2011/08/07 15:07:44 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.137 2011/08/07 15:17:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.136 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -408,7 +408,7 @@ if ($nboftargetok) { if ($target =~ /RPM/) { # Linux only $NEWDESTI=$DESTI; $subdir="package_rpm_generic"; - if ($target =~ /FEDO/i) { $subdir="package_rpm_fedora"; } + 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; } @@ -510,7 +510,7 @@ if ($nboftargetok) { # To remove once stable $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"; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; @@ -518,21 +518,6 @@ if ($nboftargetok) { $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"`; - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index cb3cfb4db43..a1efafc8e80 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -94,7 +94,7 @@ cui hai bisogno ed essere facile da usare. %{__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 #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 +%{__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/htdocs From fc0d0aa59646b093ba6448f04f04161e4b8eb3de Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:29:00 +0000 Subject: [PATCH 75/88] Works on windows package From 9251ac8e3fead79afc028f15889e35b36faecb2d Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 16:36:45 +0000 Subject: [PATCH 76/88] some css3 enhancement for eldy menu --- htdocs/theme/eldy/style.css.php | 41 ++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..a71f71e1776 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,14 +270,32 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border-radius: 6px 6px 0px 0px; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 2px solid #dee7ec; + border-bottom: 1px solid #dee7ec; + -moz-box-shadow: 2px 0px 4px #898484; + -webkit-box-shadow: 2px 0px 4px #898484; + box-shadow: 2px 0px 4px #898484; } a.tmenu:active { background: #F4F4F4; @@ -289,10 +307,19 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; + -moz-border-radius: 6px 6px 0px 0px; + -webkit-border-radius: 6px 6px 0px 0px; + border-radius: 6px 6px 0px 0px; + -moz-background-clip: padding; + -webkit-background-clip: padding-box; + background-clip: padding-box; + -moz-box-shadow: 2px 0px 4px #0C0C0C; + -webkit-box-shadow: 2px 0px 4px #0C0C0C; + box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; + border-bottom: 1px solid #F4F4F4; white-space: nowrap; } @@ -1214,6 +1241,14 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + } From ac8b8bb80fd980273f65b3d5c82013edba4dd38f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 16:37:45 +0000 Subject: [PATCH 77/88] Works on windows package From 66c2a02b34a9c24c93ea4f19f9ed685d1d20dada Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 7 Aug 2011 17:54:36 +0000 Subject: [PATCH 78/88] fix : shadow for main boxes on home page --- htdocs/theme/eldy/style.css.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a71f71e1776..57b816d40cc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.91 2011/08/07 16:36:45 grandoc Exp $ + * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1091,6 +1091,15 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; + +box-shadow: 4px 4px 4px #CCC; + } table.noborder tr { @@ -1108,6 +1117,7 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ + } table.nobordernopadding { From fbe71c946d80d55f3e861afd16c2fc7da4426d21 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:01:14 +0000 Subject: [PATCH 79/88] Work on package --- build/makepack-dolibarr.pl | 7 +++++-- build/rpm/dolibarr_fedora.spec | 10 +++------- build/rpm/dolibarr_generic.spec | 11 +++-------- build/rpm/dolibarr_mandriva.spec | 10 +++------- build/rpm/dolibarr_opensuse.spec | 10 +++------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 16aaca197c1..c5e40bcfd36 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.137 2011/08/07 15:17:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -579,6 +579,9 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $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`; next; } diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a1efafc8e80..95104674ce2 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__%{?dist} 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - 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) AutoReqProv: no diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 87ba28cc946..d7740f5bc29 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,15 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse @@ -229,10 +226,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr - #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7341ab17fc9..6e9ae710589 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c26b42651f9..6ffc9df8692 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ 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 @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team 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 #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no From 812fa522cb0d8f2b05ab33bd4963ceae5db069ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 18:20:57 +0000 Subject: [PATCH 80/88] Work on package --- build/rpm/dolibarr_fedora.spec | 14 ++++---- build/rpm/dolibarr_generic.spec | 61 ++++++++++++++++---------------- build/rpm/dolibarr_mandriva.spec | 14 ++++---- build/rpm/dolibarr_opensuse.spec | 14 ++++---- 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 95104674ce2..87da5c20a4c 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -113,15 +113,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index d7740f5bc29..9b873d674f4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -29,7 +29,8 @@ Group: Networking/WWW # For all other distrib Group: Applications/Internet # 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: 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 @@ -121,37 +122,37 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* -#lang(ar_SA) /usr/share/dolibarr/htdocs/langs/ar_SA -#lang(ca_ES) /usr/share/dolibarr/htdocs/langs/ca_ES -#lang(da_DK) /usr/share/dolibarr/htdocs/langs/da_DK -#lang(de_AT) /usr/share/dolibarr/htdocs/langs/de_AT -#lang(de_DE) /usr/share/dolibarr/htdocs/langs/de_DE -#lang(el_GR) /usr/share/dolibarr/htdocs/langs/el_GR -#lang(en_AU) /usr/share/dolibarr/htdocs/langs/el_AU -#lang(en_GB) /usr/share/dolibarr/htdocs/langs/el_GB -#lang(en_IN) /usr/share/dolibarr/htdocs/langs/el_IN -#lang(en_NZ) /usr/share/dolibarr/htdocs/langs/el_NZ -#lang(en) /usr/share/dolibarr/htdocs/langs/en_US -#lang(es_AR) /usr/share/dolibarr/htdocs/langs/es_AR -#lang(es) /usr/share/dolibarr/htdocs/langs/es_ES -#lang(es_HN) /usr/share/dolibarr/htdocs/langs/es_HN -#lang(es_MX) /usr/share/dolibarr/htdocs/langs/en_MX -#lang(es_PR) /usr/share/dolibarr/htdocs/langs/en_PR -#lang(fa_IR) /usr/share/dolibarr/htdocs/langs/fa_IR -#lang(fi_FI) /usr/share/dolibarr/htdocs/langs/fi_FI -#lang(fr_BE) /usr/share/dolibarr/htdocs/langs/fr_BE -#lang(fr_CA) /usr/share/dolibarr/htdocs/langs/fr_CA -#lang(fr_CH) /usr/share/dolibarr/htdocs/langs/fr_CH -#lang(fr) /usr/share/dolibarr/htdocs/langs/fr_FR +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* +#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA +#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES +#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK +#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT +#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE +#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR +#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU +#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB +#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN +#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ +#lang(en) %_datadir/dolibarr/htdocs/langs/en_US +#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR +#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES +#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN +#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX +#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR +#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR +#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI +#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE +#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA +#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH +#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 6e9ae710589..79df79dcf40 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -112,15 +112,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 6ffc9df8692..f785d3f41b1 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -111,15 +111,15 @@ cui hai bisogno ed essere facile da usare. %files %defattr(-, root, root, 0755) -%doc /usr/share/doc/dolibarr -%dir /usr/share/dolibarr/build -%dir /usr/share/dolibarr/htdocs -%dir /usr/share/dolibarr/scripts +%doc %_datadir/doc/dolibarr +%dir %_datadir/dolibarr/build +%dir %_datadir/dolibarr/htdocs +%dir %_datadir/dolibarr/scripts %_datadir/pixmaps/dolibarr.png %_datadir/applications/dolibarr.desktop -/usr/share/dolibarr/build/* -/usr/share/dolibarr/htdocs/* -/usr/share/dolibarr/scripts/* +%_datadir/dolibarr/build/* +%_datadir/dolibarr/htdocs/* +%_datadir/dolibarr/scripts/* %defattr(0664, -, -) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php From ce3d99f7b2d223d90e52e32de38395bdd687efea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:52:45 +0000 Subject: [PATCH 81/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 101 +++++++------------------------- 1 file changed, 21 insertions(+), 80 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 57b816d40cc..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,32 +269,14 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border-radius: 6px 6px 0px 0px; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 1px solid #dee7ec; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; + border-bottom: 2px solid #dee7ec; } a.tmenu:active { background: #F4F4F4; @@ -307,19 +288,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -moz-box-shadow: 2px 0px 4px #0C0C0C; - -webkit-box-shadow: 2px 0px 4px #0C0C0C; - box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 1px solid #F4F4F4; + border-bottom: 2px solid #F4F4F4; white-space: nowrap; } @@ -843,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -883,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -899,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -915,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -931,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -959,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1091,15 +1059,6 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; - -box-shadow: 4px 4px 4px #CCC; - } table.noborder tr { @@ -1117,7 +1076,6 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ - } table.nobordernopadding { @@ -1251,17 +1209,8 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - - } - .box { padding-right: 0px; padding-left: 0px; @@ -1278,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1318,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1329,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1341,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1436,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1459,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1557,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 51ed6bec4f365a3221bc9c2254d4a9f55c3ba4d0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:58:48 +0000 Subject: [PATCH 82/88] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 52d6791b7e2..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin + * Copyright (C) 2011 Philippe Grand * * 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 @@ -20,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 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 @@ -815,10 +816,9 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; - -moz-border-radius-bottomleft:6px; - -moz-border-radius-bottomright:6px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,8 +856,9 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -871,8 +872,9 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -886,8 +888,9 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -901,8 +904,9 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -928,8 +932,9 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1211,6 +1216,7 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } + .box { padding-right: 0px; padding-left: 0px; @@ -1227,8 +1233,6 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; } tr.box_impair { @@ -1269,6 +1273,8 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #efefd4; } @@ -1278,6 +1284,8 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #EFCFCF; } @@ -1288,6 +1296,8 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; background: #efefd4; } @@ -1381,6 +1391,8 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; } @@ -1402,7 +1414,9 @@ opacity: 1; } .bodyline { - -moz-border-radius:8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1498,7 +1512,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 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-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .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; } From 54fa92d5b2cb103517bbb0f4dfc6911ab6a45eb8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH 83/88] Work on package --- build/makepack-dolibarr.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 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.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%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) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ if ($nboftargetok) { #rmdir "$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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # 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"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; From 10702cb823d6ee9f3253996f643547dbc6ccf92c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH 84/88] Work on package From 3fd2d552a6707b92b2977d984790023fa7b9f7f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH 85/88] Fix: Do not close automatically deposits From f85a4148fcebb23f43d18ef9abc03947caf510ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:01:45 +0000 Subject: [PATCH 86/88] Fix: Do not close automatically deposits From 9825f7e91e38627314036eeb3a184250d9d399bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:10:07 +0000 Subject: [PATCH 87/88] Fix: Use short instead of long labels From 5692be2b7061b5762f5366c320be551064eee3b9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:53:25 +0000 Subject: [PATCH 88/88] Fix: When a line is defined as option, it was not possible to remove "options" then.