diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f2fe4a762d1..2216b9e294f 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.133 2011/08/03 21:46:02 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.135 2011/08/07 00:13:04 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -14,12 +14,15 @@ $MINOR="1"; $BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD -@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages +@LISTETARGET=("TGZ","ZIP","RPM_GENE","RPM_FEDO","RPM_MAND","RPM_OPEN","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages %REQUIREMENTTARGET=( # Tool requirement for each package "SNAPSHOT"=>"tar", "TGZ"=>"tar", "ZIP"=>"7z", -"RPM"=>"rpmbuild", +"RPM_GENE"=>"rpmbuild", +"RPM_FEDO"=>"rpmbuild", +"RPM_MAND"=>"rpmbuild", +"RPM_OPEN"=>"rpmbuild", "DEB"=>"dpkg", "APS"=>"zip", "EXEDOLIWAMP"=>"iscc.exe" @@ -48,7 +51,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.133 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.135 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -135,14 +138,14 @@ else { } # On demande de choisir le fichier à passer - print "Choose one package number or several separated with space: "; + print "Choose one package number or several separated with space (0 - ".$cpt."): "; $NUM_SCRIPT=; chomp($NUM_SCRIPT); if ($NUM_SCRIPT =~ s/-//g) { # Do not do copy $copyalreadydone=1; } - if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/) + if ($NUM_SCRIPT !~ /^[0-9\s]+$/) { print "This is not a valid package number list.\n"; $found = 0; @@ -421,7 +424,7 @@ if ($nboftargetok) { next; } - if ($target eq 'RPM') { # Linux only + if ($target =~ /RPM/) { # Linux only #$ARCH='i386'; $ARCH='noarch'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } @@ -471,6 +474,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/live`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/patch`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/rpm/conf.php`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/zip`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/dev/dbmodel`; @@ -506,6 +510,8 @@ if ($nboftargetok) { $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; + $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 @@ -555,9 +561,14 @@ if ($nboftargetok) { rename("$BUILDROOT/$FILENAMETGZ2.tgz","$RPMDIR/SOURCES/$FILENAMETGZ2.tgz"); $ret=`$cmd`; - $BUILDFIC="$FILENAME.spec"; + $BUILDFIC="${FILENAME}.spec"; + $BUILDFICSRC="${FILENAME}_generic.spec"; + if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; } + if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; } + if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; } + print "Generate file $BUILDROOT/$BUILDFIC\n"; - open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFIC}") || die "Error"; + open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error"; open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error"; while () { $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/; diff --git a/build/rpm/conf.php b/build/rpm/conf.php new file mode 100755 index 00000000000..78ac824b12f --- /dev/null +++ b/build/rpm/conf.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec new file mode 100755 index 00000000000..8f0a678759d --- /dev/null +++ b/build/rpm/dolibarr_fedora.spec @@ -0,0 +1,233 @@ +#--------------------------------------------------------- +# Spec file to build a rpm file +# +# This is an example to build a rpm file. You can use this +# file to build a package for your own distributions and +# edit it if you need to match your rules. +# -------------------------------------------------------- + +%define version __VERSION__ + +Name: dolibarr +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 +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti + +License: GPLv2+ +#Packager: Laurent Destailleur (Eldy) +Vendor: Dolibarr dev team + +URL: http://www.dolibarr.org +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz +BuildArch: noarch +#BuildArchitectures: noarch +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 + + +%description +An easy to use CRM & ERP open source/free software for small +and medium companies, foundations or freelances. It includes different +features for Enterprise Resource Planning (ERP) and Customer Relationship +Management (CRM) but also for different other activities. +Dolibarr was designed to provide only features you need and be easy to +use. + +%description -l es +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. + +%description -l fr +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +artisans ou associations. Il permet de gérer vos clients, prospect, +fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings +et bien d'autres choses dans une interface pensée pour la simplicité. + +%description -l it +Un programmo gestionale per piccole e medie +imprese, fondazioni e liberi professionisti. Include varie funzionalità per +Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori +attività. Progettato per poter fornire solo ciò di cui hai bisogno +ed essere facile da usare. +Programmo web, progettato per poter fornire solo ciò di +cui hai bisogno ed essere facile da usare. + + + +#---- prep +%prep +%setup -q + + + +#---- build +%build +# Nothing to build + + + +#---- install +%install +%{__rm} -rf $RPM_BUILD_ROOT + +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php +%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr + +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__desktop-file-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 +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__cp} -pr usr/share/dolibarr/build $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/htdocs $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/doc/* $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT + + +#---- clean +%clean +%{__rm} -rf $RPM_BUILD_ROOT + + + +#---- files +%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 +%_datadir/pixmaps/dolibarr.png +%_datadir/applications/dolibarr.desktop +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* + +%defattr(0664, -, -) +%config(noreplace) %{_sysconfdir}/dolibarr/conf.php +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr + + + +#---- post (after unzip during install) +%post + +# Define vars +export docdir="/var/lib/dolibarr/documents" +export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" +export apacheuser='apache'; +export apachegroup='apache'; + +# Remove lock file +%{__rm} -f $docdir/install.lock + +# Create empty directory for uploaded files and generated documents +echo Create document directory $docdir +%{__mkdir} -p $docdir + +%{__chown} -R root:$apachegroup /etc/dolibarr/* + +# Create config for se $seconfig +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 + +# Create a config link dolibarr.conf +if [ ! -L $apachelink ]; then + echo Create dolibarr web server config link $apachelink + ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink +fi + +echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr +%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr +%{__chmod} -R o-w /var/lib/dolibarr + +# Restart web server +echo Restart web server +if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart +fi +if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart +fi + +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + +# Show result +echo +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" +echo "Dolibarr files are now installed (into /usr/share/dolibarr)." +echo "To finish installation and use Dolibarr, click on the menu" +echo "entry Dolibarr ERP-CRM or call the following page from your" +echo "web browser:" +echo "http://localhost/dolibarr/" +echo "--------------------------------------------------" +echo + + +#---- postun (after uninstall) +%postun + +# Define vars +export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + +# Remove apache link +if [ -L $apachelink ] ; +then + echo Delete apache config link for Dolibarr + %{__rm} -f $apachelink + status=purge +fi + +# Restart web servers if required +if [ "x$status" = "xpurge" ] ; +then + # Restart web server + echo Restart web server + if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart + fi + if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart + fi +fi + + + +%changelog +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr_generic.spec old mode 100644 new mode 100755 similarity index 71% rename from build/rpm/dolibarr.spec rename to build/rpm/dolibarr_generic.spec index 6829d98e847..6a03be7d091 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,13 +6,11 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define name dolibarr %define version __VERSION__ -%define release __RELEASE__ -Name: %{name} +Name: dolibarr Version: %{version} -Release: %{release} +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 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations @@ -22,12 +20,11 @@ License: GPLv2+ #Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team -URL: http://www.%{name}.org -Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz +URL: http://www.dolibarr.org +Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#Icon: dolibarr_logo1.gif +BuildRoot: %{_tmppath}/dolibarr-%{version}-build # For Mandriva-Mageia Group: Networking/WWW @@ -41,9 +38,6 @@ Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysq # Requires for Mandriva-Mageia #Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl -#Requires(pre): -#Requires(postun): - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -83,20 +77,23 @@ cui hai bisogno ed essere facile da usare. #---- prep %prep -echo Building %{name}-%{version}-%{release} %setup -q + #---- build %build # Nothing to build + #---- install %install %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php +%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php %{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf %{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr @@ -108,12 +105,13 @@ echo Building %{name}-%{version}-%{release} %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr %{__cp} -pr usr/share/dolibarr/build $RPM_BUILD_ROOT/usr/share/dolibarr %{__cp} -pr usr/share/dolibarr/htdocs $RPM_BUILD_ROOT/usr/share/dolibarr %{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr -%{__cp} -pr usr/share/dolibarr/doc/* $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr -%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT%{_datadir}/doc/dolibarr/COPYRIGHT +%{__cp} -pr usr/share/dolibarr/doc/* $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT + #---- clean @@ -121,39 +119,57 @@ echo Building %{name}-%{version}-%{release} %{__rm} -rf $RPM_BUILD_ROOT + #---- files %files -%defattr(-,root,root) -%doc %{_datadir}/doc/dolibarr/* +%defattr(-, root, root, 0755) +%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/%{name}.desktop +%_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 -%defattr(0664, -, -, 0755) +%defattr(0664, -, -) +%config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php %config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr + #---- post (after unzip during install) %post # Define vars -# Dolibarr files are stored into /usr/share -export targetdir='/usr/share/dolibarr' -# Dolibarr uploaded files and generated documents will be stored into docdir export docdir="/var/lib/dolibarr/documents" -export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" -export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" -export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" # Detect OS os='unknown'; @@ -189,35 +205,24 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir %{__mkdir} -p $docdir -%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory -superuserlogin='' -superuserpassword='' -if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then - # Load superuser login and pass - superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') - superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') -fi -echo Mysql superuser found to use is $superuserlogin -if [ -z "$superuserlogin" ] ; then - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig -else - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig -fi -%{__chown} -R root:$apachegroup $installconfig -%{__chmod} -R 660 $installconfig - -# Create an empty conf.php with permission to web server -if [ ! -f $config ] +if [ "x$os" = "xubuntu-debian" ] then - echo Create empty file $config - touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config + superuserlogin='' + superuserpassword='' + if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then + # Load superuser login and pass + superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g') + superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g') + fi + echo Mysql superuser found to use is $superuserlogin + %{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.install | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__chmod} -R 660 $installconfig fi +%{__chown} -R root:$apachegroup /etc/dolibarr/* -# Create config file for se $seconfig +# Create config for se $seconfig 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 @@ -230,17 +235,11 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then fi # Create a config link dolibarr.conf -if [ ! -f $apachelink ]; then +if [ ! -L $apachelink ]; then echo Create dolibarr web server config link $apachelink - ln -fs $apacheconfig $apachelink + ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink fi -# Set permissions -echo Set permission to $apacheuser:$apachegroup on $targetdir -%{__chown} -R $apacheuser:$apachegroup $targetdir -%{__chmod} -R a-w $targetdir -%{__chmod} u+w $targetdir - echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr %{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr %{__chmod} -R o-w /var/lib/dolibarr @@ -264,7 +263,7 @@ fi echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" echo "Dolibarr files are now installed (into /usr/share/dolibarr)." -echo "To finish installation and use Dolibarr, click on ne menu" +echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" echo "web browser:" echo "http://localhost/dolibarr/" @@ -272,52 +271,31 @@ echo "--------------------------------------------------" echo + #---- postun (after uninstall) %postun -# Define vars -# Dolibarr files are stored into targetdir -export targetdir='/usr/share/dolibarr' -# Dolibarr uploaded files and generated documents will be stored into docdir -export docdir="/var/lib/dolibarr/documents" -export installfileorig="$targetdir/build/rpm/install.forced.php.install" -export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" -export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" -export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" - - # Detect OS os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - export apacheuser='apache'; - export apachegroup='apache'; fi if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='wwwrun'; - export apachegroup='www'; fi if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then export os='mageia-mandriva'; export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - export apacheuser='apache'; - export apachegroup='apache'; fi if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then export os='ubuntu-debian'; export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; fi -echo OS detected: $os # Remove apache link -if [ -f $apachelink ] ; +if [ -L $apachelink ] ; then echo Delete apache config link for Dolibarr %{__rm} -f $apachelink @@ -337,13 +315,6 @@ then fi fi -# Removed dirs after apache restart -echo Removed remaining $config -%{__rm} -f $config -echo Removed remaining $installconfig -%{__rm} -f $installconfig -echo Removed remaining $docdir/install.lock -%{__rm} -f $docdir/install.lock %changelog diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec new file mode 100755 index 00000000000..5dd30522ed4 --- /dev/null +++ b/build/rpm/dolibarr_mandriva.spec @@ -0,0 +1,223 @@ +#--------------------------------------------------------- +# Spec file to build a rpm file +# +# This is an example to build a rpm file. You can use this +# file to build a package for your own distributions and +# edit it if you need to match your rules. +# -------------------------------------------------------- + +%define version __VERSION__ + +Name: dolibarr +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 +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti + +License: GPLv2+ +#Packager: Laurent Destailleur (Eldy) +Vendor: Dolibarr dev team + +URL: http://www.dolibarr.org +Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz +BuildArch: noarch +#BuildArchitectures: noarch +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 + + +%description +An easy to use CRM & ERP open source/free software for small +and medium companies, foundations or freelances. It includes different +features for Enterprise Resource Planning (ERP) and Customer Relationship +Management (CRM) but also for different other activities. +Dolibarr was designed to provide only features you need and be easy to +use. + +%description -l es +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. + +%description -l fr +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +artisans ou associations. Il permet de gérer vos clients, prospect, +fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings +et bien d'autres choses dans une interface pensée pour la simplicité. + +%description -l it +Un programmo gestionale per piccole e medie +imprese, fondazioni e liberi professionisti. Include varie funzionalità per +Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori +attività. Progettato per poter fornire solo ciò di cui hai bisogno +ed essere facile da usare. +Programmo web, progettato per poter fornire solo ciò di +cui hai bisogno ed essere facile da usare. + + + +#---- prep +%prep +%setup -q + + + +#---- build +%build +# Nothing to build + + + +#---- install +%install +%{__rm} -rf $RPM_BUILD_ROOT + +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php +%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr + +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop + +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__cp} -pr usr/share/dolibarr/build $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/htdocs $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/doc/* $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT + + +#---- clean +%clean +%{__rm} -rf $RPM_BUILD_ROOT + + + +#---- files +%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 +%_datadir/pixmaps/dolibarr.png +%_datadir/applications/dolibarr.desktop +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* + +%defattr(0664, -, -) +%config(noreplace) %{_sysconfdir}/dolibarr/conf.php +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr + + + +#---- post (after unzip during install) +%post + +# Define vars +export docdir="/var/lib/dolibarr/documents" +export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" +export apacheuser='apache'; +export apachegroup='apache'; + +# Remove lock file +%{__rm} -f $docdir/install.lock + +# Create empty directory for uploaded files and generated documents +echo Create document directory $docdir +%{__mkdir} -p $docdir + +%{__chown} -R root:$apachegroup /etc/dolibarr/* + +# Create a config link dolibarr.conf +if [ ! -L $apachelink ]; then + echo Create dolibarr web server config link $apachelink + ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink +fi + +echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr +%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr +%{__chmod} -R o-w /var/lib/dolibarr + +# Restart web server +echo Restart web server +if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart +fi +if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart +fi + +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + +# Show result +echo +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" +echo "Dolibarr files are now installed (into /usr/share/dolibarr)." +echo "To finish installation and use Dolibarr, click on the menu" +echo "entry Dolibarr ERP-CRM or call the following page from your" +echo "web browser:" +echo "http://localhost/dolibarr/" +echo "--------------------------------------------------" +echo + + +#---- postun (after uninstall) +%postun + +# Define vars +export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + +# Remove apache link +if [ -L $apachelink ] ; +then + echo Delete apache config link for Dolibarr + %{__rm} -f $apachelink + status=purge +fi + +# Restart web servers if required +if [ "x$status" = "xpurge" ] ; +then + # Restart web server + echo Restart web server + if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart + fi + if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart + fi +fi + + + +%changelog +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec new file mode 100755 index 00000000000..c5c6e9e6074 --- /dev/null +++ b/build/rpm/dolibarr_opensuse.spec @@ -0,0 +1,222 @@ +#--------------------------------------------------------- +# Spec file to build a rpm file +# +# This is an example to build a rpm file. You can use this +# file to build a package for your own distributions and +# edit it if you need to match your rules. +# -------------------------------------------------------- + +%define version __VERSION__ + +Name: dolibarr +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 +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti + +License: GPLv2+ +#Packager: Laurent Destailleur (Eldy) +Vendor: Dolibarr dev team + +URL: http://www.dolibarr.org +Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz +BuildArch: noarch +#BuildArchitectures: noarch +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 + + +%description +An easy to use CRM & ERP open source/free software for small +and medium companies, foundations or freelances. It includes different +features for Enterprise Resource Planning (ERP) and Customer Relationship +Management (CRM) but also for different other activities. +Dolibarr was designed to provide only features you need and be easy to +use. + +%description -l es +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. + +%description -l fr +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +artisans ou associations. Il permet de gérer vos clients, prospect, +fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings +et bien d'autres choses dans une interface pensée pour la simplicité. + +%description -l it +Un programmo gestionale per piccole e medie +imprese, fondazioni e liberi professionisti. Include varie funzionalità per +Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori +attività. Progettato per poter fornire solo ciò di cui hai bisogno +ed essere facile da usare. +Programmo web, progettato per poter fornire solo ciò di +cui hai bisogno ed essere facile da usare. + + + +#---- prep +%prep +%setup -q + + +#---- build +%build +# Nothing to build + + +#---- install +%install +%{__rm} -rf $RPM_BUILD_ROOT + +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php +%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr + +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop + +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__cp} -pr usr/share/dolibarr/build $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/htdocs $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr +%{__cp} -pr usr/share/dolibarr/doc/* $RPM_BUILD_ROOT/usr/share/doc/dolibarr +%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT + + + +#---- clean +%clean +%{__rm} -rf $RPM_BUILD_ROOT + + + +#---- files +%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 +%_datadir/pixmaps/dolibarr.png +%_datadir/applications/dolibarr.desktop +/usr/share/dolibarr/build/* +/usr/share/dolibarr/htdocs/* +/usr/share/dolibarr/scripts/* + +%defattr(0664, -, -) +%config(noreplace) %{_sysconfdir}/dolibarr/conf.php +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr + + + +#---- post (after unzip during install) +%post + +# Define vars +export docdir="/var/lib/dolibarr/documents" +export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" +export apacheuser='wwwrun'; +export apachegroup='www'; + +# Remove lock file +%{__rm} -f $docdir/install.lock + +# Create empty directory for uploaded files and generated documents +echo Create document directory $docdir +%{__mkdir} -p $docdir + +%{__chown} -R root:$apachegroup /etc/dolibarr/* + +# Create a config link dolibarr.conf +if [ ! -L $apachelink ]; then + echo Create dolibarr web server config link $apachelink + ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink +fi + +echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr +%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr +%{__chmod} -R o-w /var/lib/dolibarr + +# Restart web server +echo Restart web server +if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart +fi +if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart +fi + +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + +# Show result +echo +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" +echo "Dolibarr files are now installed (into /usr/share/dolibarr)." +echo "To finish installation and use Dolibarr, click on the menu" +echo "entry Dolibarr ERP-CRM or call the following page from your" +echo "web browser:" +echo "http://localhost/dolibarr/" +echo "--------------------------------------------------" +echo + + +#---- postun (after uninstall) +%postun + +# Define vars +export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + +# Remove apache link +if [ -L $apachelink ] ; +then + echo Delete apache config link for Dolibarr + %{__rm} -f $apachelink + status=purge +fi + +# Restart web servers if required +if [ "x$status" = "xpurge" ] ; +then + # Restart web server + echo Restart web server + if [ -f %{_sysconfdir}/init.d/httpd ]; then + %{_sysconfdir}/init.d/httpd restart + fi + if [ -f %{_sysconfdir}/init.d/apache2 ]; then + %{_sysconfdir}/init.d/apache2 restart + fi +fi + + + +%changelog +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install index 9b0455c5470..2ffcc9e0105 100755 --- a/build/rpm/install.forced.php.install +++ b/build/rpm/install.forced.php.install @@ -1,5 +1,5 @@ . -

trans("ShowInvoice"); ?>

+

trans("ShowInvoice"); ?>


trans("PrintTicket"); ?>

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 0cecb922024..125cfe9aa22 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -20,7 +20,7 @@ /** * \file htdocs/compta/resultat/clientfourn.php * \brief Page reporting - * \version $Id: clientfourn.php,v 1.63 2011/08/03 00:46:31 eldy Exp $ + * \version $Id: clientfourn.php,v 1.64 2011/08/06 18:44:59 eldy Exp $ */ require('../../main.inc.php'); @@ -105,7 +105,7 @@ $html=new Form($db); if ($modecompta=="CREANCES-DETTES") { $nom=$langs->trans("AnnualByCompaniesDueDebtMode"); - $nom.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; + $nom.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultDue"); @@ -114,7 +114,7 @@ if ($modecompta=="CREANCES-DETTES") } else { $nom=$langs->trans("AnnualByCompaniesInputOutputMode"); - $nom.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; + $nom.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; //$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',1,1,0,'',1,0,1); $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=''.img_previous().' '.img_next().''; @@ -663,8 +663,8 @@ else if ($mysoc->tva_assuj != 'franchise') // Assujeti { print ''; - if ($modecompta == 'CREANCES-DETTES') print ''.price($subtotal_ht).''; - print ''.price($subtotal_ttc).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price(price2num($subtotal_ht)).''; + print ''.price(price2num($subtotal_ttc)).''; print ''; } @@ -677,8 +677,8 @@ if ($mysoc->tva_assuj != 'franchise') // Assujeti print ''; print ''.$langs->trans("Profit").''; - if ($modecompta == 'CREANCES-DETTES') print ''.price($total_ht).''; - print ''.price($total_ttc).''; + if ($modecompta == 'CREANCES-DETTES') print ''.price(price2num($total_ht)).''; + print ''.price(price2num($total_ttc)).''; print ''; } @@ -688,5 +688,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.63 $'); +llxFooter('$Date: 2011/08/06 18:44:59 $ - $Revision: 1.64 $'); ?> diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..c039ebc903b 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -24,7 +24,7 @@ * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.95 2011/08/06 23:10:01 eldy Exp $ */ include_once("./inc.php"); @@ -161,8 +161,8 @@ if (! empty($force_install_message)) ?> '; - print ''; + if ($force_install_noedit) print ''; + print ''; ?> '; - print ''; + if ($force_install_noedit) print ''; + print ''; ?> trans("Examples").":
"; ?> @@ -321,10 +321,10 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Server"); ?> - + value=""> - '; ?> + '; ?> trans("ServerAddressDescription"); ?> @@ -333,10 +333,10 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Port"); ?> - + value=""> - '; ?> + '; ?> trans("ServerPortDescription"); ?> @@ -390,7 +390,10 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t - +

trans("DatabaseSuperUserAccess"); ?>