From e06484bfbac1ba91eec8818be40726345f34eb8f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 14:11:40 +0000 Subject: [PATCH 001/223] Qual: A lot of fixes to enhance package quality --- build/deb/apache.conf | 22 ++++++---------------- build/deb/changelog | 2 +- build/deb/control | 27 ++++++++++----------------- build/deb/install.forced.php.install | 7 +++---- build/deb/postinst | 22 +++++++++++++--------- build/deb/templates | 15 +++------------ 6 files changed, 36 insertions(+), 59 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..d37b433fb98 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -13,10 +13,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # CustomLog logs/ldap.example.com-access.log common # -# Directory for web pages - - Order deny,allow - Allow from all + DirectoryIndex index.php Options +FollowSymLinks +Indexes @@ -56,23 +53,16 @@ Alias /dolibarr /usr/share/dolibarr/htdocs #ExpiresByType application/x-javascript A2592000 #ExpiresByType application/javascript A2592000 - + -# Directory for public pages - + AllowOverride All Order deny,allow Allow from all - + -# Directory for data files - + AllowOverride All Order deny,allow Allow from all - - - AllowOverride All - Order deny,allow - Allow from all - + diff --git a/build/deb/changelog b/build/deb/changelog index d75fd100a60..182110624de 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,4 +1,4 @@ -dolibarr 3.1.0 unstable; urgency=low + dolibarr 3.1.0 unstable; urgency=low * New 3.1.0 release More information into /usr/share/dolibarr/ChangeLog file. -- maintainer Laurent Destailleur 2011-07-09 \ No newline at end of file diff --git a/build/deb/control b/build/deb/control index 2d356fc7b2b..3f564f5608f 100644 --- a/build/deb/control +++ b/build/deb/control @@ -3,39 +3,35 @@ Version: __VERSION__ Architecture: all Maintainer: Laurent Destailleur Essential: no -Installed-Size: 61200 +Installed-Size: 31200 Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl Section: web Priority: optional -Recommends: firefox +Recommends: mozilla | netscape Homepage: http://www.dolibarr.org -Description: Easy to use ERP & CRM software to manage your activity. +Description: ERP & CRM software to manage your activity. Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. + Management (CRM) but also other features for different activities. . - Only features you need are visible, depending on which module were activated. - Most common used modules are: + Dolibarr features are activated by modules. Most common modules are: . + * Products and services catalog + * Stock management + * Bank accounts management * Customers, Suppliers or Prospects directory * Contacts directory * Orders management * Commercial proposals management * Invoices management - * Products and services catalog - * Stock management - * Foundations members management - * Bank accounts management * Point of Sale * Payments management * Commercial actions management * Contracts management * Standing orders management * Shipping management + * Foundations members management * Donations management * Bookmarks management * Mass Emailings @@ -43,7 +39,4 @@ Description: Easy to use ERP & CRM software to manage your activity. * Data export and import tools * LDAP connectivity * PDF exports - * And a lot of more modules... - . - You can also add third parties external modules or develop yours. - \ No newline at end of file + * And a lot of other modules diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install index 1166abe41ae..198565d3211 100755 --- a/build/deb/install.forced.php.install +++ b/build/deb/install.forced.php.install @@ -4,13 +4,12 @@ // This file must be present into htdocs/install directory // during install process to be used. // -// $Id: install.forced.php.install,v 1.7 2011/07/09 15:48:19 eldy Exp $ +// $Id: install.forced.php.install,v 1.6 2011/07/09 14:11:40 eldy Exp $ // - $force_install_noedit=1; $force_install_message='KeepDefaultValuesDeb'; -$force_install_main_data_root='/usr/share/dolibarr/documents'; -#$force_install_main_data_root='/var/lib/dolibarr'; +#$force_install_main_data_root='/usr/share/dolibarr/documents'; +$force_install_main_data_root='/var/lib/dolibarr'; $force_install_type='mysqli'; $force_install_dbserver='localhost'; $force_install_port='3306'; diff --git a/build/deb/postinst b/build/deb/postinst index be9fb7521b7..4d065f58ca0 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -49,21 +49,19 @@ case "$1" in cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config fi - # Create document directory - #docdir='/var/lib/dolibarr/documents' - docdir='/usr/share/dolibarr/documents' - mkdir -p $docdir - chown -R www-data:www-data $docdir - chmod -R 775 $docdir - chmod -R g+s $docdir + # Create /var/lib/dolibarr/documents + mkdir -p /var/lib/dolibarr/documents + chown -R www-data:www-data /var/lib/dolibarr/documents; + chmod -R 775 /var/lib/dolibarr/documents; + chmod -R g+s /var/lib/dolibarr/documents; # Create an empty conf.php with permission to web server if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ] then echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php touch /usr/share/dolibarr/htdocs/conf/conf.php - chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php - chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php + chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php; + chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php; fi #db_reset "dolibarr/webserver" @@ -108,6 +106,12 @@ case "$1" in done + # Copy icon file + #echo "Copy icon file" + #fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm" + #target="/usr/share/pixmaps/" + #cp -f $fileorig $target + #echo "Install menu entry" # This one is for Gnome ubuntu #fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop" diff --git a/build/deb/templates b/build/deb/templates index 1d1c133f99a..3b370ee68f2 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -15,7 +15,7 @@ Description: Package configuration note Template: dolibarr/webserver Type: select Choices: Apache, Apache-ssl, Both, None -Description: Which Web Server are you running ? +Description: Which Web Server are you running? Dolibarr supports any web server with PHP capabilities, but this configuration process only supports Apache and Apache-SSL. @@ -91,15 +91,6 @@ Template: dolibarr/postrm Type: boolean Default: true Description: Delete database ? - Delete the Dolibarr MySQL database and all its datas (datas related - to this quetion are the Dolibarr DBMS account and all + Answer yes if you want to delete also the Dolibarr MySQL database and all + its datas (datas subjected to this quetion are the Dolibarr DBMS account and all Dolibarr tables) ? - -Template: dolibarr/postrmfile -Type: boolean -Default: true -Description: Delete attached files ? - Delete also all uploaded and generated files (datas related - to this quetion are all files found into /usr/share/dolibarr/documents, - uploaded or generated when using Dolibarr) ? - \ No newline at end of file From 9112c571fc441ddc69d29f555f8997b71e2e9c14 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 15:48:19 +0000 Subject: [PATCH 002/223] Qual: A lot of fixes to enhance package quality --- build/deb/apache.conf | 8 ++++++++ build/deb/changelog | 2 +- build/deb/control | 20 +++++++++++--------- build/deb/install.forced.php.install | 7 ++++--- build/deb/postinst | 16 +++++++++------- build/deb/templates | 15 ++++++++++++--- build/makepack-dolibarr.pl | 8 ++++---- 7 files changed, 49 insertions(+), 27 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index d37b433fb98..568dd605dca 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -13,6 +13,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # CustomLog logs/ldap.example.com-access.log common # +# Directory for web pages DirectoryIndex index.php Options +FollowSymLinks +Indexes @@ -55,12 +56,19 @@ Alias /dolibarr /usr/share/dolibarr/htdocs +# Directory for public pages AllowOverride All Order deny,allow Allow from all +# Directory for data files + + AllowOverride All + Order deny,allow + Allow from all + AllowOverride All Order deny,allow diff --git a/build/deb/changelog b/build/deb/changelog index 182110624de..d75fd100a60 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,4 +1,4 @@ - dolibarr 3.1.0 unstable; urgency=low +dolibarr 3.1.0 unstable; urgency=low * New 3.1.0 release More information into /usr/share/dolibarr/ChangeLog file. -- maintainer Laurent Destailleur 2011-07-09 \ No newline at end of file diff --git a/build/deb/control b/build/deb/control index 3f564f5608f..07a08b7d045 100644 --- a/build/deb/control +++ b/build/deb/control @@ -7,31 +7,32 @@ Installed-Size: 31200 Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl Section: web Priority: optional -Recommends: mozilla | netscape +Recommends: firefox Homepage: http://www.dolibarr.org -Description: ERP & CRM software to manage your activity. +Description: Easy to use ERP & CRM software to manage your activity. Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also other features for different activities. + Management (CRM) but also for different other activities. . - Dolibarr features are activated by modules. Most common modules are: + Only features you need are visible, depending on which module were activated. + Most common used modules are: . - * Products and services catalog - * Stock management - * Bank accounts management * Customers, Suppliers or Prospects directory * Contacts directory * Orders management * Commercial proposals management * Invoices management + * Products and services catalog + * Stock management + * Foundations members management + * Bank accounts management * Point of Sale * Payments management * Commercial actions management * Contracts management * Standing orders management * Shipping management - * Foundations members management * Donations management * Bookmarks management * Mass Emailings @@ -39,4 +40,5 @@ Description: ERP & CRM software to manage your activity. * Data export and import tools * LDAP connectivity * PDF exports - * And a lot of other modules + * And a lot of more modules... +You can also add third parties external modules or develop yours. \ No newline at end of file diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install index 198565d3211..1166abe41ae 100755 --- a/build/deb/install.forced.php.install +++ b/build/deb/install.forced.php.install @@ -4,12 +4,13 @@ // This file must be present into htdocs/install directory // during install process to be used. // -// $Id: install.forced.php.install,v 1.6 2011/07/09 14:11:40 eldy Exp $ +// $Id: install.forced.php.install,v 1.7 2011/07/09 15:48:19 eldy Exp $ // + $force_install_noedit=1; $force_install_message='KeepDefaultValuesDeb'; -#$force_install_main_data_root='/usr/share/dolibarr/documents'; -$force_install_main_data_root='/var/lib/dolibarr'; +$force_install_main_data_root='/usr/share/dolibarr/documents'; +#$force_install_main_data_root='/var/lib/dolibarr'; $force_install_type='mysqli'; $force_install_dbserver='localhost'; $force_install_port='3306'; diff --git a/build/deb/postinst b/build/deb/postinst index 4d065f58ca0..12e3fdbd07a 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -49,19 +49,21 @@ case "$1" in cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config fi - # Create /var/lib/dolibarr/documents - mkdir -p /var/lib/dolibarr/documents - chown -R www-data:www-data /var/lib/dolibarr/documents; - chmod -R 775 /var/lib/dolibarr/documents; - chmod -R g+s /var/lib/dolibarr/documents; + # Create document directory + #docdir='/var/lib/dolibarr/documents' + docdir='/usr/share/dolibarr/documents' + mkdir -p $docdir + chown -R www-data:www-data $docdir + chmod -R 775 $docdir + chmod -R g+s $docdir # Create an empty conf.php with permission to web server if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ] then echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php touch /usr/share/dolibarr/htdocs/conf/conf.php - chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php; - chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php; + chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php + chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php fi #db_reset "dolibarr/webserver" diff --git a/build/deb/templates b/build/deb/templates index 3b370ee68f2..1d1c133f99a 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -15,7 +15,7 @@ Description: Package configuration note Template: dolibarr/webserver Type: select Choices: Apache, Apache-ssl, Both, None -Description: Which Web Server are you running? +Description: Which Web Server are you running ? Dolibarr supports any web server with PHP capabilities, but this configuration process only supports Apache and Apache-SSL. @@ -91,6 +91,15 @@ Template: dolibarr/postrm Type: boolean Default: true Description: Delete database ? - Answer yes if you want to delete also the Dolibarr MySQL database and all - its datas (datas subjected to this quetion are the Dolibarr DBMS account and all + Delete the Dolibarr MySQL database and all its datas (datas related + to this quetion are the Dolibarr DBMS account and all Dolibarr tables) ? + +Template: dolibarr/postrmfile +Type: boolean +Default: true +Description: Delete attached files ? + Delete also all uploaded and generated files (datas related + to this quetion are all files found into /usr/share/dolibarr/documents, + uploaded or generated when using Dolibarr) ? + \ No newline at end of file diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 532bf16a2da..2cc4b0b880e 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.108 2011/07/09 18:29:46 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.107 2011/07/09 15:48:19 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.108 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.107 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -529,8 +529,8 @@ if ($nboftargetok) { $ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.php -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - #$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.pl -type f -exec chmod 755 {} \\; "; - #$ret=`$cmd`; + $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.pl -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name *.php -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name *.php -type f -exec chmod 755 {} \\; "; From 363a409673f900e1d2f0bd6de63f1dccd4745405 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 17:42:07 +0000 Subject: [PATCH 003/223] Work on packaging RPM & DEB --- build/deb/control | 7 ++- build/deb/postinst | 6 -- build/rpm/README | 12 +--- build/rpm/dolibarr.desktop | 5 +- build/rpm/dolibarr.spec | 117 ++++++++----------------------------- 5 files changed, 31 insertions(+), 116 deletions(-) diff --git a/build/deb/control b/build/deb/control index 07a08b7d045..3d8878f4569 100644 --- a/build/deb/control +++ b/build/deb/control @@ -3,7 +3,7 @@ Version: __VERSION__ Architecture: all Maintainer: Laurent Destailleur Essential: no -Installed-Size: 31200 +Installed-Size: 61200 Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl Section: web Priority: optional @@ -14,6 +14,7 @@ Description: Easy to use ERP & CRM software to manage your activity. 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. . Only features you need are visible, depending on which module were activated. Most common used modules are: @@ -41,4 +42,6 @@ Description: Easy to use ERP & CRM software to manage your activity. * LDAP connectivity * PDF exports * And a lot of more modules... -You can also add third parties external modules or develop yours. \ No newline at end of file + . + You can also add third parties external modules or develop yours. + \ No newline at end of file diff --git a/build/deb/postinst b/build/deb/postinst index 12e3fdbd07a..be9fb7521b7 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -108,12 +108,6 @@ case "$1" in done - # Copy icon file - #echo "Copy icon file" - #fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm" - #target="/usr/share/pixmaps/" - #cp -f $fileorig $target - #echo "Install menu entry" # This one is for Gnome ubuntu #fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop" diff --git a/build/rpm/README b/build/rpm/README index c072a212632..1b2d4745dc4 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,14 +10,6 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # -# On Fedora -# yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum install dolibarr To remove package +# yum erase dolibarr To remove package # -# On OpenSuse -# yast --install dolibarr-...rpm To install package and dependencies -# yast --remove dolibarr To remove package -# -# On Mageia (after su - root) -# urpmi dolibarr-...rpm To install package and dependencies -# urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index ab2a758867f..e3be821080c 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -5,12 +5,9 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM -Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs -Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones +Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b3aaca1d494..b1def13ae37 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -32,8 +32,7 @@ Group: Networking/WWW 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 +AutoReqProv: yes %description @@ -44,31 +43,12 @@ 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 -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. - %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. -%description -l it -Dolibarr è un programma gestionale open source e gratuito per piccole e medie -imprese, fondazioni e liberi professionisti. Include varie funzionalità per -Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno -ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di -cui hai bisogno ed essere facile da usare. - - #---- prep %prep @@ -104,6 +84,17 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +# menu +#%{__install} -d $RPM_BUILD_ROOT%{_menudir} +#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} +#?package(%{name}):\ +#command="Dolibarr" \ +#section="Office" \ +#title="Dolibarr" \ +#icon="dolibarr_48x48.png" \ +#longtitle="Dolibarr ERP & CRM" +#EOF + #---- clean %clean @@ -169,59 +160,30 @@ if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then chmod go-w %{_sysconfdir}/dolibarr/apache.conf fi - -# Detect OS -os='unknown'; -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='wwwrun'; - export apachegroup='wwwrun'; -fi -if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then - export os='mageia-mandriva'; - export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os - -# Create a config link dolibarr.conf for Fedora or Redhat -if [ ! -f $conffile ]; then - echo Create dolibarr web server config link $conffile - ln -fs /etc/dolibarr/apache.conf $conffile +# Create a config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf +if [ ! -f %{_sysconfdir}/httpd/conf.d/dolibarr.conf ]; then + echo Create dolibarr web server config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf %{_sysconfdir}/httpd/conf.d/dolibarr.conf fi # Set permissions -echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir +echo Set permission on $targetdir +chown -R apache.apache $targetdir chmod -R a-w $targetdir -echo Set permission to $apacheuser:$apachegroup on $docdir -chown -R $apacheuser:$apachegroup $docdir +echo Set permission on $docdir +chown -R apache.apache $docdir chmod -R o-w $docdir # Create empty conf.php file for web installer if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php + chown apache.apache $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then +if [ -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -236,9 +198,6 @@ 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 # Show result echo @@ -255,39 +214,12 @@ echo %postun %clean_menus -# Detect OS -os='unknown'; -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='wwwrun'; - export apachegroup='wwwrun'; -fi -if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then - export os='mageia-mandriva'; - export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os - # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' # Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents export docdir='/usr/share/dolibarr/documents' +export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" if [ -f $conffile ] ; then echo Delete apache config file for Dolibarr @@ -302,9 +234,6 @@ then 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 rm -rf /etc/dolibarr From eaaf335b82eb51d07e05e569c240914a974c1749 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 18:29:46 +0000 Subject: [PATCH 004/223] Work on packaging RPM & DEB --- build/makepack-dolibarr.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 2cc4b0b880e..532bf16a2da 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.107 2011/07/09 15:48:19 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.108 2011/07/09 18:29:46 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.107 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.108 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -529,8 +529,8 @@ if ($nboftargetok) { $ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.php -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.pl -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; + #$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.pl -type f -exec chmod 755 {} \\; "; + #$ret=`$cmd`; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name *.php -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name *.php -type f -exec chmod 755 {} \\; "; From 1871b536507d2457f7d7719d8aa951daa547aa71 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:18:50 +0000 Subject: [PATCH 005/223] Prepare release 3.1 From c551c4066526bf68bf46dcccbb0d59b183f2fc56 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:26:53 +0000 Subject: [PATCH 006/223] Work on packaging RPM & DEB --- build/deb/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/deb/control b/build/deb/control index 3d8878f4569..2d356fc7b2b 100644 --- a/build/deb/control +++ b/build/deb/control @@ -14,6 +14,8 @@ Description: Easy to use ERP & CRM software to manage your activity. and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. Dolibarr was designed to provide only features you need and be easy to use. . Only features you need are visible, depending on which module were activated. From db76b959ee226bc4553f4a63566bb2202756290c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:33:27 +0000 Subject: [PATCH 007/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.desktop | 5 ++++- build/rpm/dolibarr.spec | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index e3be821080c..ab2a758867f 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -5,9 +5,12 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b1def13ae37..4bfbcfaae65 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -43,12 +43,34 @@ 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 +Dolibarr ERP/CRM es un software completamente modular (sólo activaremos las funciones +que deseemos) para gestión de PYMES, profesionales independientes, auto emprendedores +ó asociaciones. En términos más técnicos, es un ERP y CRM. Es un proyecto OpenSource +que se ejecuta en el seno de un servidor Web, siendo pues accesible desde cualquier +lugar disponiendo de una conexión a Internet. +Dolibarr viene a completar la oferta de numerosas aplicaciones de esta categoría, +pero desmarcándose por el hecho de que se hace todo lo posible para proporcionar simplicidad: +Simple de instalar (con instaladores para los que ignoran como instalar un servidor Web). +Simple de usar (funciones modulares para no sobrecargar los menús, informaciones claras y concisas). +Simple de desarrollar (sin frameworks pesados). + %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. +%description -l it +Dolibarr è un programma gestionale open source e gratuito per piccole e medie +imprese, fondazioni e liberi professionisti. Include varie funzionalità per +Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +ed essere facile da usare. +Dolibar è completamente web-based, progettato per poter fornire solo ciò di +cui hai bisogno ed essere facile da usare. + + #---- prep %prep From f65c0844aab9450ddcf9dd152dc4d5af706b32b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:33:53 +0000 Subject: [PATCH 008/223] Use global option if local not defined From 9d9b502ad10c90b9b4ca4287adb1148f04cc1185 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:39:34 +0000 Subject: [PATCH 009/223] Add comment From b0cf4f38f52b867b70c999bdf7dbb6cea04b329b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:48:25 +0000 Subject: [PATCH 010/223] Fix: Param of constructor must be only database handler From 80e35efa34d2e9dbf7c11763b9a6d4218a884cb3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 16:50:40 +0000 Subject: [PATCH 011/223] Fix: Missing fields and missing encoding of special chars --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7e97abed808..4863b52689e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ + * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 165092678ea5a4396d88a2f8b3f6773d16690a90 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 17:28:09 +0000 Subject: [PATCH 012/223] Fix: missing htmlname in ajax response --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4863b52689e..7e97abed808 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ + * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From e9d72e5f89fcd69c37ab3a29e69fd5731226aa25 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 18:24:18 +0000 Subject: [PATCH 013/223] Fix: possibility to change status of another input element From bca0d835f0da837166a3c7c32815668ee3b95bd0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 20:03:38 +0000 Subject: [PATCH 014/223] Fix: file add and delte in email forms was broken with firefox 5 --- htdocs/lib/files.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 3dbbef2c6b2..8b6ea639ec8 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ + * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ */ /** @@ -561,8 +561,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger && is_object($object)) + if (! $notrigger) { + if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From ac827279f0a7e9032bd3bfe7ea7700b0207f914f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 21:17:14 +0000 Subject: [PATCH 015/223] Fix: Missing name on form From 1972d2a5a34a7637f6eb453d87eb0e794dcbfb4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 22:45:44 +0000 Subject: [PATCH 016/223] Work on packaging RPM & DEB --- build/rpm/README | 12 +++++-- build/rpm/dolibarr.spec | 70 +++++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index 1b2d4745dc4..f2077ceac36 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,6 +10,14 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # -# yum install dolibarr To remove package -# yum erase dolibarr To remove package +# On Fedora +# yum install dolibarr-...rpm To install package and dependencies +# yum erase dolibarr To remove package # +# On OpenSuse +# yast --install dolibarr-...rpm To install package and dependencies +# yast --remove dolibarr To remove package +# +# On Mageia +# urpmi dolibarr-...rpm To install package and dependencies +# urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 4bfbcfaae65..a9003afcac3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -44,16 +44,13 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP/CRM es un software completamente modular (sólo activaremos las funciones -que deseemos) para gestión de PYMES, profesionales independientes, auto emprendedores -ó asociaciones. En términos más técnicos, es un ERP y CRM. Es un proyecto OpenSource -que se ejecuta en el seno de un servidor Web, siendo pues accesible desde cualquier -lugar disponiendo de una conexión a Internet. -Dolibarr viene a completar la oferta de numerosas aplicaciones de esta categoría, -pero desmarcándose por el hecho de que se hace todo lo posible para proporcionar simplicidad: -Simple de instalar (con instaladores para los que ignoran como instalar un servidor Web). -Simple de usar (funciones modulares para no sobrecargar los menús, informaciones claras y concisas). -Simple de desarrollar (sin frameworks pesados). +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, @@ -182,19 +179,35 @@ if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then chmod go-w %{_sysconfdir}/dolibarr/apache.conf fi -# Create a config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf -if [ ! -f %{_sysconfdir}/httpd/conf.d/dolibarr.conf ]; then - echo Create dolibarr web server config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf - ln -fs /etc/dolibarr/apache.conf %{_sysconfdir}/httpd/conf.d/dolibarr.conf + +# Detect OS +os='fedora'; +if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora'; + export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + apacheuser='apache'; + apachegroup='apache'; +fi +if [ -d %{_sysconfdir}/apache2/conf.d ]; then + export os='opensuse'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + apacheuser='wwwrun'; + apachegroup='wwwrun'; +fi + +# Create a config link dolibarr.conf for Fedora or Redhat +if [ ! -f $conffile ]; then + echo Create dolibarr web server config link $conffile + ln -fs /etc/dolibarr/apache.conf $conffile fi # Set permissions -echo Set permission on $targetdir -chown -R apache.apache $targetdir +echo Set permission to $apacheuser:$apachegroup on $targetdir +chown -R $apacheuser:$apachegroup $targetdir chmod -R a-w $targetdir -echo Set permission on $docdir -chown -R apache.apache $docdir +echo Set permission to $apacheuser:$apachegroup on $docdir +chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir # Create empty conf.php file for web installer @@ -205,7 +218,7 @@ if [ ! -s $targetdir/htdocs/conf/conf.php ]; then chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -220,6 +233,9 @@ 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 # Show result echo @@ -236,12 +252,23 @@ echo %postun %clean_menus +# Detect OS +os='fedora'; +if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora'; + export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" +fi +if [ -d %{_sysconfdir}/apache2/conf.d ]; then + export os='opensuse'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" +fi + + # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' # Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents export docdir='/usr/share/dolibarr/documents' -export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" if [ -f $conffile ] ; then echo Delete apache config file for Dolibarr @@ -256,6 +283,9 @@ then 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 rm -rf /etc/dolibarr From c22b069729b2570455f7d201dc5e39eebfd431d6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 11 Jul 2011 06:23:22 +0000 Subject: [PATCH 017/223] Fix: need complete object --- htdocs/lib/files.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 8b6ea639ec8..3dbbef2c6b2 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ + * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ */ /** @@ -561,9 +561,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger) + if (! $notrigger && is_object($object)) { - if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From 7358502822ce62d33ebe349ff2dd40f1380bc824 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 07:50:22 +0000 Subject: [PATCH 018/223] RPM works alos on ubuntu and debian --- build/rpm/dolibarr.spec | 57 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index a9003afcac3..46c0b734ca3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -32,7 +32,8 @@ Group: Networking/WWW Group: Applications/Internet Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -AutoReqProv: yes +# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) +AutoReqProv: no %description @@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr -# menu -#%{__install} -d $RPM_BUILD_ROOT%{_menudir} -#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} -#?package(%{name}):\ -#command="Dolibarr" \ -#section="Office" \ -#title="Dolibarr" \ -#icon="dolibarr_48x48.png" \ -#longtitle="Dolibarr ERP & CRM" -#EOF - #---- clean %clean @@ -181,19 +171,26 @@ fi # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - apacheuser='apache'; - apachegroup='apache'; + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - apacheuser='wwwrun'; - apachegroup='wwwrun'; + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -214,11 +211,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown apache.apache $targetdir/htdocs/conf/conf.php + chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -253,16 +250,26 @@ echo %clean_menus # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi - +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' From 7f4989b9bc8f17e5899bd7c3da423ada156dc5b3 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 07:51:31 +0000 Subject: [PATCH 019/223] Trad: add possibility to force mail errors-to to all mails sent From 20a0d77740001f8fd7dfad932434ecf556356353 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:36:11 +0000 Subject: [PATCH 020/223] Work on packaging RPM & DEB --- build/rpm/README | 2 +- build/rpm/dolibarr.spec | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index f2077ceac36..c072a212632 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -18,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia +# On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 46c0b734ca3..b3aaca1d494 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -171,20 +171,26 @@ fi # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; @@ -250,20 +256,26 @@ echo %clean_menus # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; From ca5f9a9dc015b3ccddb1b03d1119a116cafe47df Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 08:38:02 +0000 Subject: [PATCH 021/223] Fix: Missing translation From 44b424940a7b1b69003d39a33085c3ee2aeaaa05 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:54:57 +0000 Subject: [PATCH 022/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index 568dd605dca..cfedcbc4dbb 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -14,7 +14,9 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # # Directory for web pages - + + Order deny,allow + Allow from all DirectoryIndex index.php Options +FollowSymLinks +Indexes @@ -54,23 +56,23 @@ Alias /dolibarr /usr/share/dolibarr/htdocs #ExpiresByType application/x-javascript A2592000 #ExpiresByType application/javascript A2592000 - + # Directory for public pages - + AllowOverride All Order deny,allow Allow from all - + # Directory for data files - + AllowOverride All Order deny,allow Allow from all - - + + AllowOverride All Order deny,allow Allow from all - + From a48c19967f7715eaa39eb6d5d877e0f27eb79a95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 023/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..fa29149ee59 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index e1fcb3f77e5..4a395f235a2 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From b57393cef1fdf9ca9cb812f2e256d5eb0a83e4f7 Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 024/223] Correction paiement Ajax From 118780113146de60cef99db100bbe8cd3fbecf8d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 025/223] Trad: add translation From 90dc7ae7a042b2d2e5cd18624dce9567e0cbd54e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 026/223] Fix: Removed install warning From 10430e397e50818b91bb1222c195406ba3d2cf4b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 027/223] Work on packaging RPM & DEB --- build/makepack-dolibarr.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 532bf16a2da..8e0e3a0b1d1 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.108 2011/07/09 18:29:46 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.109 2011/07/11 11:09:02 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.108 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.109 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -262,6 +262,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/install.lock`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; From b0bc44938f27199e5325a3e00bb2cfea3eb661ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 028/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b3aaca1d494..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -31,7 +31,13 @@ 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 +#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 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -182,7 +188,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -267,7 +273,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -307,9 +313,12 @@ then fi fi +# Removed dirs after apache restart +echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install - +rmdir $targetdir/doc >/dev/null 2>&1 +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog From 7ef50d386c793b734687e8fd471b87758a944de2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 029/223] Work on packaging RPM & DEB --- build/rpm/README | 1 + build/rpm/dolibarr.spec | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index c072a212632..d868ed411b8 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,6 +11,7 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora +# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From fd75cb6e23683e88f9ba7c6ad3757c9b28fe8769 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 030/223] Fix: Uniformise code From 765df60f0507674da3de403e854aece972ffe6ef Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 031/223] Fix: update jstree plugin From 8e179f0755937d3acb9abdc756b62e170128ee18 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 032/223] Fix: Upgrade detection fails From c43da8596e511eef13f0d0d12f563f2c60642722 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 033/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From b5a03d2c320bee74006589b7e8265420ef36b45e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 034/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 8d8501bbae63af059ee8e9457bd6e10f3bfe3bb5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 035/223] Fix: Type of amount From 444df637be94f137ef6baecb8fe0a981cf5f32f0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 036/223] Fix: Add civility for all peopal tables From 4234799592eaf695f98d8ed20f8dd0b0c9870adc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 037/223] Fix: Add civility for all peopal tables From ac0d843b2732617febcf3a78f816ae94fddbf4dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 038/223] Fix: Attachment fails if content was empty From 17f8181d36f7288acc46ef1f12d7667b377ce67e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 039/223] Fix: Uniformise code From c3b2c31f528a6bd821381b2fffc597163adb5163 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 040/223] Fix: update jstree plugin From 5aca04f939c11783d2ee642d6a666b0806964232 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 041/223] Fix: Upgrade detection fails From 9bc13db24554b2ff2b4b4ec716feaa998f430ec3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 042/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 9078c8b743ae1c87965827a4bbe702eb9ba9be65 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 043/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From f7d154076f8daa6690bde46f646e6af4b5dd146b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 044/223] Fix: Type of amount From 1941beb36d4ad7fbd80171cf0328c16f3274e5f4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 045/223] Fix: Add civility for all peopal tables From 122ea43ebe1a345360acf133b95f130475f322cb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 046/223] Fix: Add civility for all peopal tables From b83995bb15fe908c05dae5e706512dccd26accfb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 047/223] Fix: Attachment fails if content was empty From b466a2962c8a2611ab49f63a105904527eb1d2e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:48:25 +0000 Subject: [PATCH 048/223] Fix: Param of constructor must be only database handler From 0c2bacd32b423323c92eebe87019b5ab177bb60f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 16:50:40 +0000 Subject: [PATCH 049/223] Fix: Missing fields and missing encoding of special chars --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7e97abed808..4863b52689e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ + * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 9f83740fa3c4811b6acf54011d1d0849f7189bff Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 17:28:09 +0000 Subject: [PATCH 050/223] Fix: missing htmlname in ajax response --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4863b52689e..7e97abed808 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ + * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From e95e550f607cc4860f42db7db0701d5b44f8ae3c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 18:24:18 +0000 Subject: [PATCH 051/223] Fix: possibility to change status of another input element From df2592a6cc0125ca8eb1594234cff4b27c2e7e9a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 20:03:38 +0000 Subject: [PATCH 052/223] Fix: file add and delte in email forms was broken with firefox 5 --- htdocs/lib/files.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 3dbbef2c6b2..8b6ea639ec8 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ + * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ */ /** @@ -561,8 +561,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger && is_object($object)) + if (! $notrigger) { + if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From 82889c92ce57402b62b303eb8a0e0398457565df Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 21:17:14 +0000 Subject: [PATCH 053/223] Fix: Missing name on form From ec0e4ffba329943a6e858fd3cbfb653ca207feed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 22:45:44 +0000 Subject: [PATCH 054/223] Work on packaging RPM & DEB --- build/rpm/README | 3 +- build/rpm/dolibarr.spec | 101 ++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 68 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index d868ed411b8..f2077ceac36 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,7 +11,6 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora -# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # @@ -19,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia (after su - root) +# On Mageia # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..a9003afcac3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,32 +19,20 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - -# Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -# Requires for OpenSuse -#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia -#Requires: 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 +AutoReqProv: yes %description @@ -100,19 +88,32 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +# menu +#%{__install} -d $RPM_BUILD_ROOT%{_menudir} +#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} +#?package(%{name}):\ +#command="Dolibarr" \ +#section="Office" \ +#title="Dolibarr" \ +#icon="dolibarr_48x48.png" \ +#longtitle="Dolibarr ERP & CRM" +#EOF + #---- clean %clean @@ -180,32 +181,19 @@ fi # Detect OS -os='unknown'; +os='fedora'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; + export os='fedora'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - export apacheuser='apache'; - export apachegroup='apache'; + apacheuser='apache'; + apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then +if [ -d %{_sysconfdir}/apache2/conf.d ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='wwwrun'; - export apachegroup='www'; + apacheuser='wwwrun'; + apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then - export os='mageia-mandriva'; - export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -226,11 +214,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php + chown apache.apache $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -265,32 +253,16 @@ echo %clean_menus # Detect OS -os='unknown'; +os='fedora'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; + export os='fedora'; export conffile="%{_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 +if [ -d %{_sysconfdir}/apache2/conf.d ]; then export os='opensuse'; export conffile="%{_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 conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os + # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' @@ -316,12 +288,9 @@ then fi fi -# Removed dirs after apache restart -echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install -rmdir $targetdir/doc >/dev/null 2>&1 -rmdir $targetdir/htdocs >/dev/null 2>&1 + %changelog From aa330d84ca0b63a678cf2d7f03a0715ba3296541 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 11 Jul 2011 06:23:22 +0000 Subject: [PATCH 055/223] Fix: need complete object --- htdocs/lib/files.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 8b6ea639ec8..3dbbef2c6b2 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ + * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ */ /** @@ -561,9 +561,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger) + if (! $notrigger && is_object($object)) { - if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From d906a13c5842d84ce49e1416761d97519dd3afdb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 07:50:22 +0000 Subject: [PATCH 056/223] RPM works alos on ubuntu and debian --- build/rpm/dolibarr.spec | 57 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index a9003afcac3..46c0b734ca3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -32,7 +32,8 @@ Group: Networking/WWW Group: Applications/Internet Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -AutoReqProv: yes +# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) +AutoReqProv: no %description @@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr -# menu -#%{__install} -d $RPM_BUILD_ROOT%{_menudir} -#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} -#?package(%{name}):\ -#command="Dolibarr" \ -#section="Office" \ -#title="Dolibarr" \ -#icon="dolibarr_48x48.png" \ -#longtitle="Dolibarr ERP & CRM" -#EOF - #---- clean %clean @@ -181,19 +171,26 @@ fi # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - apacheuser='apache'; - apachegroup='apache'; + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - apacheuser='wwwrun'; - apachegroup='wwwrun'; + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -214,11 +211,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown apache.apache $targetdir/htdocs/conf/conf.php + chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -253,16 +250,26 @@ echo %clean_menus # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi - +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' From f520575ec5a7f8fa19c6bc88bdffb27a9551f532 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 07:51:31 +0000 Subject: [PATCH 057/223] Trad: add possibility to force mail errors-to to all mails sent From 0f3541396ccc1f8f339b3430e109fd1cb0140bc8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:36:11 +0000 Subject: [PATCH 058/223] Work on packaging RPM & DEB --- build/rpm/README | 2 +- build/rpm/dolibarr.spec | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index f2077ceac36..c072a212632 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -18,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia +# On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 46c0b734ca3..b3aaca1d494 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -171,20 +171,26 @@ fi # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; @@ -250,20 +256,26 @@ echo %clean_menus # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; From a275ecab8644504154e93320a777de4ee2300067 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 08:38:02 +0000 Subject: [PATCH 059/223] Fix: Missing translation From 4b4c7e485db2b8e91f4a7b1af9a24e4f0ad2bc57 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:54:57 +0000 Subject: [PATCH 060/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index fa29149ee59..cfedcbc4dbb 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index 4a395f235a2..e1fcb3f77e5 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From 11e364a99297b9dda2ae4862b1d87c0da119c52e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 061/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..fa29149ee59 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index e1fcb3f77e5..4a395f235a2 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From c456ed187bae6694224408e7750c707f6979db61 Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 062/223] Correction paiement Ajax From 912fe7b3461b1ca4789d29ab7850b2b46476b5e4 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 063/223] Trad: add translation From de03ca55b93375f4391a95a3e6629e2d42915ead Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 064/223] Fix: Removed install warning From acd3fc1f14a6902bbb245b2a433077230e2987ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 065/223] Work on packaging RPM & DEB From 86605340ae8a9a1589efe57a7853d884caf20aba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 066/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b3aaca1d494..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -31,7 +31,13 @@ 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 +#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 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -182,7 +188,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -267,7 +273,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -307,9 +313,12 @@ then fi fi +# Removed dirs after apache restart +echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install - +rmdir $targetdir/doc >/dev/null 2>&1 +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog From a7c6bfe13075c42c4e607faee81f8e9d43b0e92b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 067/223] Work on packaging RPM & DEB --- build/rpm/README | 1 + build/rpm/dolibarr.spec | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index c072a212632..d868ed411b8 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,6 +11,7 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora +# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 76bbc7b9ad97e9bf4a7043e2d40d0a83c23ecd90 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 068/223] Fix: Uniformise code From ff99b81c8e3f4cd99c56d428e0a227949eeffd38 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 069/223] Fix: update jstree plugin From b22857af366f9c9714268fc2c80f98210942e5f6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 070/223] Fix: Upgrade detection fails From c56d8b4ca353dde227c87dc84413a93d51d36ac8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 071/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From aaffdb58e3fca7be70fa6016f455b9b3cf4f36ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 072/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From e9d39ccfbbed4fdf06552f63d46057df2e3df09a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 073/223] Fix: Type of amount From 24b62f97b295d3f69a1031ae199626e7c2f0cb82 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 074/223] Fix: Add civility for all peopal tables From 3188eef450801c2ec31bfb8fdac558c8382033d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 075/223] Fix: Add civility for all peopal tables From faab747dfe5f6faef40ace736804308de18f500e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 076/223] Fix: Attachment fails if content was empty From b972864854805972aadeae10dcb9a5d6fc792f44 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:18:50 +0000 Subject: [PATCH 077/223] Prepare release 3.1 From f4407ae437a32ce77682143288a7ef7095b92357 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:26:53 +0000 Subject: [PATCH 078/223] Work on packaging RPM & DEB From 8c278bc0e6b233d3595df893a733e6d23a658e9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:33:27 +0000 Subject: [PATCH 079/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 147 ++++++++++++---------------------------- 1 file changed, 43 insertions(+), 104 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..4bfbcfaae65 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,32 +19,20 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - -# Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -# Requires for OpenSuse -#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia -#Requires: 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 +AutoReqProv: yes %description @@ -56,13 +44,16 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Dolibarr ERP/CRM es un software completamente modular (sólo activaremos las funciones +que deseemos) para gestión de PYMES, profesionales independientes, auto emprendedores +ó asociaciones. En términos más técnicos, es un ERP y CRM. Es un proyecto OpenSource +que se ejecuta en el seno de un servidor Web, siendo pues accesible desde cualquier +lugar disponiendo de una conexión a Internet. +Dolibarr viene a completar la oferta de numerosas aplicaciones de esta categoría, +pero desmarcándose por el hecho de que se hace todo lo posible para proporcionar simplicidad: +Simple de instalar (con instaladores para los que ignoran como instalar un servidor Web). +Simple de usar (funciones modulares para no sobrecargar los menús, informaciones claras y concisas). +Simple de desarrollar (sin frameworks pesados). %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, @@ -100,19 +91,32 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +# menu +#%{__install} -d $RPM_BUILD_ROOT%{_menudir} +#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} +#?package(%{name}):\ +#command="Dolibarr" \ +#section="Office" \ +#title="Dolibarr" \ +#icon="dolibarr_48x48.png" \ +#longtitle="Dolibarr ERP & CRM" +#EOF + #---- clean %clean @@ -178,59 +182,30 @@ if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then chmod go-w %{_sysconfdir}/dolibarr/apache.conf fi - -# Detect OS -os='unknown'; -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export conffile="%{_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 conffile="%{_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 conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os - -# Create a config link dolibarr.conf for Fedora or Redhat -if [ ! -f $conffile ]; then - echo Create dolibarr web server config link $conffile - ln -fs /etc/dolibarr/apache.conf $conffile +# Create a config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf +if [ ! -f %{_sysconfdir}/httpd/conf.d/dolibarr.conf ]; then + echo Create dolibarr web server config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf %{_sysconfdir}/httpd/conf.d/dolibarr.conf fi # Set permissions -echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir +echo Set permission on $targetdir +chown -R apache.apache $targetdir chmod -R a-w $targetdir -echo Set permission to $apacheuser:$apachegroup on $docdir -chown -R $apacheuser:$apachegroup $docdir +echo Set permission on $docdir +chown -R apache.apache $docdir chmod -R o-w $docdir # Create empty conf.php file for web installer if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php + chown apache.apache $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then +if [ -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -245,9 +220,6 @@ 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 # Show result echo @@ -264,39 +236,12 @@ echo %postun %clean_menus -# Detect OS -os='unknown'; -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export conffile="%{_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 conffile="%{_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 conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os - # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' # Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents export docdir='/usr/share/dolibarr/documents' +export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" if [ -f $conffile ] ; then echo Delete apache config file for Dolibarr @@ -311,17 +256,11 @@ then 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 -# Removed dirs after apache restart -echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install -rmdir $targetdir/doc >/dev/null 2>&1 -rmdir $targetdir/htdocs >/dev/null 2>&1 + %changelog From 4180b3878088e3990ac2b73dc30b0442554470f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:33:53 +0000 Subject: [PATCH 080/223] Use global option if local not defined From be44af3c38428bea7a838d3ef9ece3300de7d0a2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:39:34 +0000 Subject: [PATCH 081/223] Add comment From 6e1fd1e821fac2332fb9bfdd851e846e726f3e65 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:48:25 +0000 Subject: [PATCH 082/223] Fix: Param of constructor must be only database handler From d42c3166b68296d772b9fb5710e97cbb9522ed65 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 16:50:40 +0000 Subject: [PATCH 083/223] Fix: Missing fields and missing encoding of special chars --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7e97abed808..4863b52689e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ + * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From b9a15451913d671cde9cc91bb2b0d275e242584c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 17:28:09 +0000 Subject: [PATCH 084/223] Fix: missing htmlname in ajax response --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4863b52689e..7e97abed808 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ + * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 90ba4c52508cb709852144fd15575a00d10b876c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 18:24:18 +0000 Subject: [PATCH 085/223] Fix: possibility to change status of another input element From a98a461b2f4fca7073d6d76c757ce75c405c1bc1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 20:03:38 +0000 Subject: [PATCH 086/223] Fix: file add and delte in email forms was broken with firefox 5 --- htdocs/lib/files.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 3dbbef2c6b2..8b6ea639ec8 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ + * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ */ /** @@ -561,8 +561,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger && is_object($object)) + if (! $notrigger) { + if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From 69acfd545e06b6aaa37bb221196b7e37ccba7768 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 21:17:14 +0000 Subject: [PATCH 087/223] Fix: Missing name on form From b93fdc1b0380e0c7ff8c93d910a7123c36f08326 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 22:45:44 +0000 Subject: [PATCH 088/223] Work on packaging RPM & DEB --- build/rpm/README | 3 +- build/rpm/dolibarr.spec | 70 +++++++++++++++++++++++++++++------------ 2 files changed, 51 insertions(+), 22 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index d868ed411b8..f2077ceac36 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,7 +11,6 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora -# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # @@ -19,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia (after su - root) +# On Mageia # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 4bfbcfaae65..a9003afcac3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -44,16 +44,13 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP/CRM es un software completamente modular (sólo activaremos las funciones -que deseemos) para gestión de PYMES, profesionales independientes, auto emprendedores -ó asociaciones. En términos más técnicos, es un ERP y CRM. Es un proyecto OpenSource -que se ejecuta en el seno de un servidor Web, siendo pues accesible desde cualquier -lugar disponiendo de una conexión a Internet. -Dolibarr viene a completar la oferta de numerosas aplicaciones de esta categoría, -pero desmarcándose por el hecho de que se hace todo lo posible para proporcionar simplicidad: -Simple de instalar (con instaladores para los que ignoran como instalar un servidor Web). -Simple de usar (funciones modulares para no sobrecargar los menús, informaciones claras y concisas). -Simple de desarrollar (sin frameworks pesados). +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, @@ -182,19 +179,35 @@ if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then chmod go-w %{_sysconfdir}/dolibarr/apache.conf fi -# Create a config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf -if [ ! -f %{_sysconfdir}/httpd/conf.d/dolibarr.conf ]; then - echo Create dolibarr web server config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf - ln -fs /etc/dolibarr/apache.conf %{_sysconfdir}/httpd/conf.d/dolibarr.conf + +# Detect OS +os='fedora'; +if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora'; + export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + apacheuser='apache'; + apachegroup='apache'; +fi +if [ -d %{_sysconfdir}/apache2/conf.d ]; then + export os='opensuse'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + apacheuser='wwwrun'; + apachegroup='wwwrun'; +fi + +# Create a config link dolibarr.conf for Fedora or Redhat +if [ ! -f $conffile ]; then + echo Create dolibarr web server config link $conffile + ln -fs /etc/dolibarr/apache.conf $conffile fi # Set permissions -echo Set permission on $targetdir -chown -R apache.apache $targetdir +echo Set permission to $apacheuser:$apachegroup on $targetdir +chown -R $apacheuser:$apachegroup $targetdir chmod -R a-w $targetdir -echo Set permission on $docdir -chown -R apache.apache $docdir +echo Set permission to $apacheuser:$apachegroup on $docdir +chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir # Create empty conf.php file for web installer @@ -205,7 +218,7 @@ if [ ! -s $targetdir/htdocs/conf/conf.php ]; then chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -220,6 +233,9 @@ 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 # Show result echo @@ -236,12 +252,23 @@ echo %postun %clean_menus +# Detect OS +os='fedora'; +if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora'; + export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" +fi +if [ -d %{_sysconfdir}/apache2/conf.d ]; then + export os='opensuse'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" +fi + + # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' # Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents export docdir='/usr/share/dolibarr/documents' -export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" if [ -f $conffile ] ; then echo Delete apache config file for Dolibarr @@ -256,6 +283,9 @@ then 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 rm -rf /etc/dolibarr From f1344ba26e0672a0bae6bf47b51a529e86323503 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 11 Jul 2011 06:23:22 +0000 Subject: [PATCH 089/223] Fix: need complete object --- htdocs/lib/files.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 8b6ea639ec8..3dbbef2c6b2 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ + * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ */ /** @@ -561,9 +561,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger) + if (! $notrigger && is_object($object)) { - if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From e4576d6669e390e1c20f71c11bd961f05dfb8714 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 07:50:22 +0000 Subject: [PATCH 090/223] RPM works alos on ubuntu and debian --- build/rpm/dolibarr.spec | 57 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index a9003afcac3..46c0b734ca3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -32,7 +32,8 @@ Group: Networking/WWW Group: Applications/Internet Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -AutoReqProv: yes +# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) +AutoReqProv: no %description @@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr -# menu -#%{__install} -d $RPM_BUILD_ROOT%{_menudir} -#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} -#?package(%{name}):\ -#command="Dolibarr" \ -#section="Office" \ -#title="Dolibarr" \ -#icon="dolibarr_48x48.png" \ -#longtitle="Dolibarr ERP & CRM" -#EOF - #---- clean %clean @@ -181,19 +171,26 @@ fi # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - apacheuser='apache'; - apachegroup='apache'; + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - apacheuser='wwwrun'; - apachegroup='wwwrun'; + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -214,11 +211,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown apache.apache $targetdir/htdocs/conf/conf.php + chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -253,16 +250,26 @@ echo %clean_menus # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi - +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' From 9d2f6be7c6e4ab2ab796a1f35820a55671edc896 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 07:51:31 +0000 Subject: [PATCH 091/223] Trad: add possibility to force mail errors-to to all mails sent From bd3b92915a6882672131d109079088cabd24e9ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:36:11 +0000 Subject: [PATCH 092/223] Work on packaging RPM & DEB --- build/rpm/README | 2 +- build/rpm/dolibarr.spec | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index f2077ceac36..c072a212632 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -18,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia +# On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 46c0b734ca3..b3aaca1d494 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -171,20 +171,26 @@ fi # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; @@ -250,20 +256,26 @@ echo %clean_menus # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; From 8d86b45cdc4c00e42825e830f6965893a4ec1934 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 08:38:02 +0000 Subject: [PATCH 093/223] Fix: Missing translation From 9539bea01f0a3888d08669306b09fecbd382bea9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:54:57 +0000 Subject: [PATCH 094/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index fa29149ee59..cfedcbc4dbb 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index 4a395f235a2..e1fcb3f77e5 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From a06d0eb448aecb3832d91619d3a0c347e4c9b0b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 095/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..fa29149ee59 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index e1fcb3f77e5..4a395f235a2 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From 17b3832cb6ad6d6242da77dd49348cc85c5433f7 Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 096/223] Correction paiement Ajax From db8acac1b7d44e6ad467ff8c0ca9b6eff6381324 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 097/223] Trad: add translation From 1e606c87c078471331ba1bbf2a3a248d60376738 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 098/223] Fix: Removed install warning From e6da744276296728be3d5e55a3e886ee9470a57a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 099/223] Work on packaging RPM & DEB From 60db3e1298c61d5b7339beee4db25a3c4e5f8d0c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 100/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b3aaca1d494..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -31,7 +31,13 @@ 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 +#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 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -182,7 +188,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -267,7 +273,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -307,9 +313,12 @@ then fi fi +# Removed dirs after apache restart +echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install - +rmdir $targetdir/doc >/dev/null 2>&1 +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog From 6d6602a82b8f341e348965ff08a0142730ab1b05 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 101/223] Work on packaging RPM & DEB --- build/rpm/README | 1 + build/rpm/dolibarr.spec | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index c072a212632..d868ed411b8 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,6 +11,7 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora +# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From da5dfe92cf4a420cd71cfdf1ef95eae689a8f38a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 102/223] Fix: Uniformise code From bb9ce624b6875acfd023583cc97e601e48a9601c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 103/223] Fix: update jstree plugin From 4d596521b7e1365c6eb8ba8729cf83836401e815 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 104/223] Fix: Upgrade detection fails From a2d957b2920aa52d72a98b26198aade9ba505bda Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 105/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From c2384d4610dc06006c1a9d2fcb99fea4cf2ada33 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 106/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 120e2c04826c6ee9c0e0ea427439a86bb5df27b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 107/223] Fix: Type of amount From 6448a6a00b7c938f60c7b86972a0e4460ab142cb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 108/223] Fix: Add civility for all peopal tables From b310fd9871d041ad4d2886a3f04b9a984e35da25 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 109/223] Fix: Add civility for all peopal tables From 5bb025cc65ba7d41e8122db9b17b389ecc677cfd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 110/223] Fix: Attachment fails if content was empty From 4a494182ab03fd7cb4f4a1114bb80b72afffad99 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 17:42:07 +0000 Subject: [PATCH 111/223] Work on packaging RPM & DEB --- build/deb/control | 2 - build/rpm/README | 13 +--- build/rpm/dolibarr.desktop | 5 +- build/rpm/dolibarr.spec | 149 ++++++++----------------------------- 4 files changed, 36 insertions(+), 133 deletions(-) diff --git a/build/deb/control b/build/deb/control index 2d356fc7b2b..3d8878f4569 100644 --- a/build/deb/control +++ b/build/deb/control @@ -14,8 +14,6 @@ Description: Easy to use ERP & CRM software to manage your activity. and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. Dolibarr was designed to provide only features you need and be easy to use. . Only features you need are visible, depending on which module were activated. diff --git a/build/rpm/README b/build/rpm/README index d868ed411b8..1b2d4745dc4 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,15 +10,6 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # -# On Fedora -# rpm -i --test dolibarr-...rpm To list dependencies of RPM -# yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum install dolibarr To remove package +# yum erase dolibarr To remove package # -# On OpenSuse -# yast --install dolibarr-...rpm To install package and dependencies -# yast --remove dolibarr To remove package -# -# On Mageia (after su - root) -# urpmi dolibarr-...rpm To install package and dependencies -# urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index ab2a758867f..e3be821080c 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -5,12 +5,9 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM -Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs -Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones +Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..b1def13ae37 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,32 +19,20 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - -# Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -# Requires for OpenSuse -#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia -#Requires: 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 +AutoReqProv: yes %description @@ -55,31 +43,12 @@ 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 -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. - %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. -%description -l it -Dolibarr è un programma gestionale open source e gratuito per piccole e medie -imprese, fondazioni e liberi professionisti. Include varie funzionalità per -Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno -ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di -cui hai bisogno ed essere facile da usare. - - #---- prep %prep @@ -100,19 +69,32 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +# menu +#%{__install} -d $RPM_BUILD_ROOT%{_menudir} +#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} +#?package(%{name}):\ +#command="Dolibarr" \ +#section="Office" \ +#title="Dolibarr" \ +#icon="dolibarr_48x48.png" \ +#longtitle="Dolibarr ERP & CRM" +#EOF + #---- clean %clean @@ -178,59 +160,30 @@ if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then chmod go-w %{_sysconfdir}/dolibarr/apache.conf fi - -# Detect OS -os='unknown'; -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export conffile="%{_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 conffile="%{_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 conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os - -# Create a config link dolibarr.conf for Fedora or Redhat -if [ ! -f $conffile ]; then - echo Create dolibarr web server config link $conffile - ln -fs /etc/dolibarr/apache.conf $conffile +# Create a config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf +if [ ! -f %{_sysconfdir}/httpd/conf.d/dolibarr.conf ]; then + echo Create dolibarr web server config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf %{_sysconfdir}/httpd/conf.d/dolibarr.conf fi # Set permissions -echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir +echo Set permission on $targetdir +chown -R apache.apache $targetdir chmod -R a-w $targetdir -echo Set permission to $apacheuser:$apachegroup on $docdir -chown -R $apacheuser:$apachegroup $docdir +echo Set permission on $docdir +chown -R apache.apache $docdir chmod -R o-w $docdir # Create empty conf.php file for web installer if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php + chown apache.apache $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then +if [ -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -245,9 +198,6 @@ 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 # Show result echo @@ -264,39 +214,12 @@ echo %postun %clean_menus -# Detect OS -os='unknown'; -if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; - export conffile="%{_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 conffile="%{_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 conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os - # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' # Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents export docdir='/usr/share/dolibarr/documents' +export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" if [ -f $conffile ] ; then echo Delete apache config file for Dolibarr @@ -311,17 +234,11 @@ then 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 -# Removed dirs after apache restart -echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install -rmdir $targetdir/doc >/dev/null 2>&1 -rmdir $targetdir/htdocs >/dev/null 2>&1 + %changelog From b608b29c415dd3fc1884195f89d4275e134084d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 18:29:46 +0000 Subject: [PATCH 112/223] Work on packaging RPM & DEB --- build/makepack-dolibarr.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 8e0e3a0b1d1..532bf16a2da 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.109 2011/07/11 11:09:02 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.108 2011/07/09 18:29:46 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.109 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.108 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -262,7 +262,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/install.lock`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; From 9f0107154b15bc273d2a9c8e7968fd286f5683fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:18:50 +0000 Subject: [PATCH 113/223] Prepare release 3.1 From bcdfad3b67a72f3e6e18a6a6bc9bcfcbcd0be548 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:26:53 +0000 Subject: [PATCH 114/223] Work on packaging RPM & DEB --- build/deb/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/deb/control b/build/deb/control index 3d8878f4569..2d356fc7b2b 100644 --- a/build/deb/control +++ b/build/deb/control @@ -14,6 +14,8 @@ Description: Easy to use ERP & CRM software to manage your activity. and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. + It's a web software you can install as a standalone program or on any web + hosting provider to use it from anywhere with any web browser. Dolibarr was designed to provide only features you need and be easy to use. . Only features you need are visible, depending on which module were activated. From 44c3efb55ce75304c104155ac3c77609eb49e88d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jul 2011 22:33:27 +0000 Subject: [PATCH 115/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.desktop | 5 ++++- build/rpm/dolibarr.spec | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index e3be821080c..ab2a758867f 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -5,9 +5,12 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b1def13ae37..4bfbcfaae65 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -43,12 +43,34 @@ 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 +Dolibarr ERP/CRM es un software completamente modular (sólo activaremos las funciones +que deseemos) para gestión de PYMES, profesionales independientes, auto emprendedores +ó asociaciones. En términos más técnicos, es un ERP y CRM. Es un proyecto OpenSource +que se ejecuta en el seno de un servidor Web, siendo pues accesible desde cualquier +lugar disponiendo de una conexión a Internet. +Dolibarr viene a completar la oferta de numerosas aplicaciones de esta categoría, +pero desmarcándose por el hecho de que se hace todo lo posible para proporcionar simplicidad: +Simple de instalar (con instaladores para los que ignoran como instalar un servidor Web). +Simple de usar (funciones modulares para no sobrecargar los menús, informaciones claras y concisas). +Simple de desarrollar (sin frameworks pesados). + %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. +%description -l it +Dolibarr è un programma gestionale open source e gratuito per piccole e medie +imprese, fondazioni e liberi professionisti. Include varie funzionalità per +Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +ed essere facile da usare. +Dolibar è completamente web-based, progettato per poter fornire solo ciò di +cui hai bisogno ed essere facile da usare. + + #---- prep %prep From 3486be4f7d88c879ec2ef89584cb10316b702f6e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:33:53 +0000 Subject: [PATCH 116/223] Use global option if local not defined From b81dd4d755d4a87fd89b4e12aafbccee65717480 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:39:34 +0000 Subject: [PATCH 117/223] Add comment From ca5e7084383237b3d25b3f74754ccf2db3e0c1b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:48:25 +0000 Subject: [PATCH 118/223] Fix: Param of constructor must be only database handler From dc5dd5c4905ad06bcc0ac9898001c964759a65fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 16:50:40 +0000 Subject: [PATCH 119/223] Fix: Missing fields and missing encoding of special chars --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7e97abed808..4863b52689e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ + * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 2ee9217bcff558190295bddf4c570e46a18f0de0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 17:28:09 +0000 Subject: [PATCH 120/223] Fix: missing htmlname in ajax response --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4863b52689e..7e97abed808 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ + * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 54f211e4c0f1117f8090c2aa3b277fc84beab58c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 18:24:18 +0000 Subject: [PATCH 121/223] Fix: possibility to change status of another input element From af466bce767abc915ec7431b2eff3968de59fcfb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 20:03:38 +0000 Subject: [PATCH 122/223] Fix: file add and delte in email forms was broken with firefox 5 --- htdocs/lib/files.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 3dbbef2c6b2..8b6ea639ec8 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ + * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ */ /** @@ -561,8 +561,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger && is_object($object)) + if (! $notrigger) { + if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From f94f48f2e9192295417deb4226672050a1051393 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 21:17:14 +0000 Subject: [PATCH 123/223] Fix: Missing name on form From dd3240b8898757b5f047b73f22e3b43c4238a511 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 22:45:44 +0000 Subject: [PATCH 124/223] Work on packaging RPM & DEB --- build/rpm/README | 12 +++++-- build/rpm/dolibarr.spec | 70 +++++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index 1b2d4745dc4..f2077ceac36 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -10,6 +10,14 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # -# yum install dolibarr To remove package -# yum erase dolibarr To remove package +# On Fedora +# yum install dolibarr-...rpm To install package and dependencies +# yum erase dolibarr To remove package # +# On OpenSuse +# yast --install dolibarr-...rpm To install package and dependencies +# yast --remove dolibarr To remove package +# +# On Mageia +# urpmi dolibarr-...rpm To install package and dependencies +# urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 4bfbcfaae65..a9003afcac3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -44,16 +44,13 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP/CRM es un software completamente modular (sólo activaremos las funciones -que deseemos) para gestión de PYMES, profesionales independientes, auto emprendedores -ó asociaciones. En términos más técnicos, es un ERP y CRM. Es un proyecto OpenSource -que se ejecuta en el seno de un servidor Web, siendo pues accesible desde cualquier -lugar disponiendo de una conexión a Internet. -Dolibarr viene a completar la oferta de numerosas aplicaciones de esta categoría, -pero desmarcándose por el hecho de que se hace todo lo posible para proporcionar simplicidad: -Simple de instalar (con instaladores para los que ignoran como instalar un servidor Web). -Simple de usar (funciones modulares para no sobrecargar los menús, informaciones claras y concisas). -Simple de desarrollar (sin frameworks pesados). +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, @@ -182,19 +179,35 @@ if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then chmod go-w %{_sysconfdir}/dolibarr/apache.conf fi -# Create a config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf -if [ ! -f %{_sysconfdir}/httpd/conf.d/dolibarr.conf ]; then - echo Create dolibarr web server config link %{_sysconfdir}/httpd/conf.d/dolibarr.conf - ln -fs /etc/dolibarr/apache.conf %{_sysconfdir}/httpd/conf.d/dolibarr.conf + +# Detect OS +os='fedora'; +if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora'; + export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + apacheuser='apache'; + apachegroup='apache'; +fi +if [ -d %{_sysconfdir}/apache2/conf.d ]; then + export os='opensuse'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + apacheuser='wwwrun'; + apachegroup='wwwrun'; +fi + +# Create a config link dolibarr.conf for Fedora or Redhat +if [ ! -f $conffile ]; then + echo Create dolibarr web server config link $conffile + ln -fs /etc/dolibarr/apache.conf $conffile fi # Set permissions -echo Set permission on $targetdir -chown -R apache.apache $targetdir +echo Set permission to $apacheuser:$apachegroup on $targetdir +chown -R $apacheuser:$apachegroup $targetdir chmod -R a-w $targetdir -echo Set permission on $docdir -chown -R apache.apache $docdir +echo Set permission to $apacheuser:$apachegroup on $docdir +chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir # Create empty conf.php file for web installer @@ -205,7 +218,7 @@ if [ ! -s $targetdir/htdocs/conf/conf.php ]; then chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -220,6 +233,9 @@ 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 # Show result echo @@ -236,12 +252,23 @@ echo %postun %clean_menus +# Detect OS +os='fedora'; +if [ -d %{_sysconfdir}/httpd/conf.d ]; then + export os='fedora'; + export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" +fi +if [ -d %{_sysconfdir}/apache2/conf.d ]; then + export os='opensuse'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" +fi + + # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' # Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents export docdir='/usr/share/dolibarr/documents' -export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" if [ -f $conffile ] ; then echo Delete apache config file for Dolibarr @@ -256,6 +283,9 @@ then 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 rm -rf /etc/dolibarr From 2e91736599ef00c4155ee592e9c8d819ca4e6ba5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 11 Jul 2011 06:23:22 +0000 Subject: [PATCH 125/223] Fix: need complete object --- htdocs/lib/files.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 8b6ea639ec8..3dbbef2c6b2 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ + * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ */ /** @@ -561,9 +561,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger) + if (! $notrigger && is_object($object)) { - if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From af843533bc3e645f81cc73141eb7e1e4a111b179 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 07:50:22 +0000 Subject: [PATCH 126/223] RPM works alos on ubuntu and debian --- build/rpm/dolibarr.spec | 57 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index a9003afcac3..46c0b734ca3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -32,7 +32,8 @@ Group: Networking/WWW Group: Applications/Internet Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -AutoReqProv: yes +# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) +AutoReqProv: no %description @@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr -# menu -#%{__install} -d $RPM_BUILD_ROOT%{_menudir} -#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} -#?package(%{name}):\ -#command="Dolibarr" \ -#section="Office" \ -#title="Dolibarr" \ -#icon="dolibarr_48x48.png" \ -#longtitle="Dolibarr ERP & CRM" -#EOF - #---- clean %clean @@ -181,19 +171,26 @@ fi # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - apacheuser='apache'; - apachegroup='apache'; + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - apacheuser='wwwrun'; - apachegroup='wwwrun'; + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -214,11 +211,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown apache.apache $targetdir/htdocs/conf/conf.php + chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -253,16 +250,26 @@ echo %clean_menus # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi - +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' From 8cab6ee238cb232ccf0f74beeb28f960dbb4d611 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 07:51:31 +0000 Subject: [PATCH 127/223] Trad: add possibility to force mail errors-to to all mails sent From 28660a07efef7f9168086ded06b15eaf14289eb4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:36:11 +0000 Subject: [PATCH 128/223] Work on packaging RPM & DEB --- build/rpm/README | 2 +- build/rpm/dolibarr.spec | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index f2077ceac36..c072a212632 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -18,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia +# On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 46c0b734ca3..b3aaca1d494 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -171,20 +171,26 @@ fi # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; @@ -250,20 +256,26 @@ echo %clean_menus # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; From 99c2b673e469ddedb0d6e7f0998052e3da85535f Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 08:38:02 +0000 Subject: [PATCH 129/223] Fix: Missing translation From 44ffdd6de32f14844178273411d3e51cf9835cb1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:54:57 +0000 Subject: [PATCH 130/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index fa29149ee59..cfedcbc4dbb 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index 4a395f235a2..e1fcb3f77e5 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From ecf96748b851705c428f4fc3d2d45bc64139fa89 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 131/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..fa29149ee59 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index e1fcb3f77e5..4a395f235a2 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From b16b057be283ed76aa3cb4b29bcd3eaafbfad1a7 Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 132/223] Correction paiement Ajax From 60e75f512fe99f99ac19abc3adefc9fd7c01ebfe Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 133/223] Trad: add translation From 13f8881a8f6241f44f333fd97cf9c286a5687bc4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 134/223] Fix: Removed install warning From e815ba633303f5007221b40158355d28298914ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 135/223] Work on packaging RPM & DEB --- build/makepack-dolibarr.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 532bf16a2da..8e0e3a0b1d1 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.108 2011/07/09 18:29:46 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.109 2011/07/11 11:09:02 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.108 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.109 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -262,6 +262,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/install.lock`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; From d3ec573f12d2f46e02db5c4a2c8e8dea3d341030 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 136/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b3aaca1d494..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -31,7 +31,13 @@ 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 +#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 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -182,7 +188,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -267,7 +273,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -307,9 +313,12 @@ then fi fi +# Removed dirs after apache restart +echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install - +rmdir $targetdir/doc >/dev/null 2>&1 +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog From 74559c890f478df1bc3f404efa986d9f30636b1c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 137/223] Work on packaging RPM & DEB --- build/rpm/README | 1 + build/rpm/dolibarr.spec | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index c072a212632..d868ed411b8 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,6 +11,7 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora +# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 8e6b85bd592baf15fdd88cbe8ee77243710179d8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 138/223] Fix: Uniformise code From 55e184ae70dc09258eb3dce26f82638db065d43c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 139/223] Fix: update jstree plugin From 3561e92e2b198a5a73a43e69c960de3657d2aee3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 140/223] Fix: Upgrade detection fails From 2b108b4d167d4be59958b6717649bcc705f7fe06 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 141/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 2520634e7aceaf773c8dab554191be3d83d4e354 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 142/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 1054545831f7beb0b33e15f26176b46e06f753a0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 143/223] Fix: Type of amount From abf8a5f6173cc1dc02e4476e255aac8af795e0ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 144/223] Fix: Add civility for all peopal tables From e5a2a3822e811b01f335295cc64f5c4cf204075f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 145/223] Fix: Add civility for all peopal tables From b0a0e5e3a429f2b0d6f78a80d7181ab403b0b351 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 146/223] Fix: Attachment fails if content was empty From 096ae5327c3c806c0c1b1d3035088eef54336976 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 13:48:25 +0000 Subject: [PATCH 147/223] Fix: Param of constructor must be only database handler From 1ebf16684a6b40912a94ce7dad95e132491a1862 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 16:50:40 +0000 Subject: [PATCH 148/223] Fix: Missing fields and missing encoding of special chars --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7e97abed808..4863b52689e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ + * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 330ad0ca5e3847317d6827cf2db80791477cc981 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 17:28:09 +0000 Subject: [PATCH 149/223] Fix: missing htmlname in ajax response --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4863b52689e..7e97abed808 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.187 2011/07/10 16:50:40 eldy Exp $ + * \version $Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $ */ @@ -876,7 +876,7 @@ class Form $selected_input_value=$product->ref; } // mode=1 means customers products - print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); if (! $hidelabel) print $langs->trans("RefOrLabel").' : '; print ''; print '
'; @@ -1117,7 +1117,7 @@ class Form if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { // mode=2 means suppliers products - print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); + print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajaxproducts.php', 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT); print $langs->trans("RefOrLabel").' : '; print '
'; } From 197562b4072213e5b93d66e6a1136a3b9df23ef7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 10 Jul 2011 18:24:18 +0000 Subject: [PATCH 150/223] Fix: possibility to change status of another input element From c1187378ea2fe09193a5d1ad6c0d7e8cd8c7d995 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 20:03:38 +0000 Subject: [PATCH 151/223] Fix: file add and delte in email forms was broken with firefox 5 --- htdocs/lib/files.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 3dbbef2c6b2..8b6ea639ec8 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ + * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ */ /** @@ -561,8 +561,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger && is_object($object)) + if (! $notrigger) { + if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From 380ee5f2b5eae23af2c8f837d0bf8e6585a30a69 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 21:17:14 +0000 Subject: [PATCH 152/223] Fix: Missing name on form From 84982aaa88961487e162c7ec5b7acc460d2359f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jul 2011 22:45:44 +0000 Subject: [PATCH 153/223] Work on packaging RPM & DEB --- build/rpm/README | 3 +- build/rpm/dolibarr.spec | 101 ++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 68 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index d868ed411b8..f2077ceac36 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,7 +11,6 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora -# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # @@ -19,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia (after su - root) +# On Mageia # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..a9003afcac3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,32 +19,20 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - -# Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -# Requires for OpenSuse -#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia -#Requires: 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 +AutoReqProv: yes %description @@ -100,19 +88,32 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +# menu +#%{__install} -d $RPM_BUILD_ROOT%{_menudir} +#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} +#?package(%{name}):\ +#command="Dolibarr" \ +#section="Office" \ +#title="Dolibarr" \ +#icon="dolibarr_48x48.png" \ +#longtitle="Dolibarr ERP & CRM" +#EOF + #---- clean %clean @@ -180,32 +181,19 @@ fi # Detect OS -os='unknown'; +os='fedora'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; + export os='fedora'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - export apacheuser='apache'; - export apachegroup='apache'; + apacheuser='apache'; + apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then +if [ -d %{_sysconfdir}/apache2/conf.d ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='wwwrun'; - export apachegroup='www'; + apacheuser='wwwrun'; + apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then - export os='mageia-mandriva'; - export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -226,11 +214,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php + chown apache.apache $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -265,32 +253,16 @@ echo %clean_menus # Detect OS -os='unknown'; +os='fedora'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora-redhat'; + export os='fedora'; export conffile="%{_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 +if [ -d %{_sysconfdir}/apache2/conf.d ]; then export os='opensuse'; export conffile="%{_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 conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - export apacheuser='www-data'; - export apachegroup='www-data'; -fi -echo OS detected: $os + # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' @@ -316,12 +288,9 @@ then fi fi -# Removed dirs after apache restart -echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install -rmdir $targetdir/doc >/dev/null 2>&1 -rmdir $targetdir/htdocs >/dev/null 2>&1 + %changelog From 6c06d83314c4a79a06c910773bfdbc746c769acc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 11 Jul 2011 06:23:22 +0000 Subject: [PATCH 154/223] Fix: need complete object --- htdocs/lib/files.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 8b6ea639ec8..3dbbef2c6b2 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.lib.php @@ -20,7 +20,7 @@ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.67 2011/07/10 20:03:41 eldy Exp $ + * \version $Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $ */ /** @@ -561,9 +561,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); - if (! $notrigger) + if (! $notrigger && is_object($object)) { - if (! is_object($object)) $object=(object) 'dummy'; $object->src_file=$dest_file; // Appel des triggers From 114f4fddb10c8f5bd0b1320eb0cfe41e8559a3fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 07:50:22 +0000 Subject: [PATCH 155/223] RPM works alos on ubuntu and debian --- build/rpm/dolibarr.spec | 57 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index a9003afcac3..46c0b734ca3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -32,7 +32,8 @@ Group: Networking/WWW Group: Applications/Internet Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql -AutoReqProv: yes +# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) +AutoReqProv: no %description @@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr -# menu -#%{__install} -d $RPM_BUILD_ROOT%{_menudir} -#%{__cat} <$RPM_BUILD_ROOT%{_menudir}/%{name} -#?package(%{name}):\ -#command="Dolibarr" \ -#section="Office" \ -#title="Dolibarr" \ -#icon="dolibarr_48x48.png" \ -#longtitle="Dolibarr ERP & CRM" -#EOF - #---- clean %clean @@ -181,19 +171,26 @@ fi # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" - apacheuser='apache'; - apachegroup='apache'; + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" - apacheuser='wwwrun'; - apachegroup='wwwrun'; + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $conffile ]; then @@ -214,11 +211,11 @@ chmod -R o-w $docdir if [ ! -s $targetdir/htdocs/conf/conf.php ]; then echo Create empty Dolibarr conf.php file touch $targetdir/htdocs/conf/conf.php - chown apache.apache $targetdir/htdocs/conf/conf.php + chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php fi -if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then echo Set SELinux permissions # Warning: chcon seems not cumulative #chcon -R -h -t httpd_sys_content_t $targetdir @@ -253,16 +250,26 @@ echo %clean_menus # Detect OS -os='fedora'; +os='fedora-redhat'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then - export os='fedora'; + export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" + export apacheuser='apache'; + export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='wwwrun'; + export apachegroup='wwwrun'; fi - +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then + export os='ubuntu-debian'; + export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" + export apacheuser='www-data'; + export apachegroup='www-data'; +fi +echo OS detected: $os # Dolibarr files are stored into /var/www export targetdir='/var/www/dolibarr' From 3d34631894f9c9e0fee34ec8ea9251623a4cf810 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 07:51:31 +0000 Subject: [PATCH 156/223] Trad: add possibility to force mail errors-to to all mails sent From b1128b1854e2399dbbb286e57f3a89329790e70a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:36:11 +0000 Subject: [PATCH 157/223] Work on packaging RPM & DEB --- build/rpm/README | 2 +- build/rpm/dolibarr.spec | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index f2077ceac36..c072a212632 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -18,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...). # yast --install dolibarr-...rpm To install package and dependencies # yast --remove dolibarr To remove package # -# On Mageia +# On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package \ No newline at end of file diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 46c0b734ca3..b3aaca1d494 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -171,20 +171,26 @@ fi # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; @@ -250,20 +256,26 @@ echo %clean_menus # Detect OS -os='fedora-redhat'; +os='unknown'; if [ -d %{_sysconfdir}/httpd/conf.d ]; then export os='fedora-redhat'; export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then +if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='wwwrun'; fi -if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then +if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then + export os='mageia-mandriva'; + export conffile="%{_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 conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='www-data'; From d8625c68bf74e9fca6cf068bdce9f69f409a2e3a Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 08:38:02 +0000 Subject: [PATCH 158/223] Fix: Missing translation From 6f83426130c0759f0be33fe721226d5de33be445 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:54:57 +0000 Subject: [PATCH 159/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index fa29149ee59..cfedcbc4dbb 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index 4a395f235a2..e1fcb3f77e5 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use dolibarr as a VirtualHost +# You can also use phpLDAPadmin as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From a00a98ea491bc0df767759a6f52359e06b961b83 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 160/223] Work on packaging RPM & DEB --- build/deb/apache.conf | 2 +- build/rpm/httpd-dolibarr.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..fa29149ee59 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -4,7 +4,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf index e1fcb3f77e5..4a395f235a2 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/build/rpm/httpd-dolibarr.conf @@ -4,7 +4,7 @@ Alias /dolibarr /var/www/dolibarr/htdocs -# You can also use phpLDAPadmin as a VirtualHost +# You can also use dolibarr as a VirtualHost # # ServerName mydolibarrhostname.com # ServerAdmin root@example.com From ae2ca654afb519f5a4c592723e97f73f516a4d6d Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 161/223] Correction paiement Ajax From c4ed19a2a3157e03ab7eda635ca0ca0cde2b780b Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 162/223] Trad: add translation From 3d6f5473eab68a4d7c6a3e22cf96a91246c839fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 163/223] Fix: Removed install warning From 8edb0b615e79933069d6aa43663b90ed8b765f5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 164/223] Work on packaging RPM & DEB From 86be8279ed6c980e8e31aef55c28f772b7b3a089 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 165/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index b3aaca1d494..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -31,7 +31,13 @@ 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 +#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 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 + # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -182,7 +188,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -267,7 +273,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge export os='opensuse'; export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; - export apachegroup='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'; @@ -307,9 +313,12 @@ then fi fi +# Removed dirs after apache restart +echo Removed remaining dirs rm -rf /etc/dolibarr rm -rf $targetdir/htdocs/conf rm -rf $targetdir/htdocs/install - +rmdir $targetdir/doc >/dev/null 2>&1 +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog From 915de26ec7b6201262f90b93b682578e2276f9a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 166/223] Work on packaging RPM & DEB --- build/rpm/README | 1 + build/rpm/dolibarr.spec | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build/rpm/README b/build/rpm/README index c072a212632..d868ed411b8 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -11,6 +11,7 @@ with format RPM (for Redhat, Mandriva, ...). # This is standard command to work on Debian packaging: # # On Fedora +# rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies # yum erase dolibarr To remove package # diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 1bdad980fa2a0d59f5616367408533573fd8f49b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 167/223] Fix: Uniformise code From e33ebe81d70622908f62cfca920fbdda7f4741f7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 168/223] Fix: update jstree plugin From e764cbff581513b460b7b19cf973187095b5925c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 169/223] Fix: Upgrade detection fails From 361acabec29a4f3ee382e0de8c1382cc69a96476 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 170/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 5bd7c6b5df478c7d67fb2faf883c28a2a5832e59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 171/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From d5b6a02aa26751a47ce89c97910161f9927a9594 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 172/223] Fix: Type of amount From e90e9bdfdb42c485ffd56940617c397b5aaeb222 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 173/223] Fix: Add civility for all peopal tables From e84721189b539162a584764dac9195c83d922f2c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 174/223] Fix: Add civility for all peopal tables From 8c897b6a6375412b4d9783478411272dbd804006 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 175/223] Fix: Attachment fails if content was empty From 890cc73a8fb38629e202b457df091d33544043ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 176/223] Work on packaging RPM & DEB From 908b360831801bf01ccf8f188fcb5c2e8bfe3b9e Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 177/223] Correction paiement Ajax From 19ddcf0be9d7b5cd16a4c0d4c8122a48f898da29 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 178/223] Trad: add translation From 8a4e05f30c85ddedd4dc72c7e691d6f205365a0e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 179/223] Fix: Removed install warning From b5687a1b91da8700a4b14d5e2053874653977fc4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 180/223] Work on packaging RPM & DEB From 0820507871fef1000a26cd482580c0803df045c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 181/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,30 +19,25 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia +# Requires for 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 @@ -100,17 +95,19 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 1685d499d45b21dafaabc99a8f9af1edcc850192 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 182/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 044d0be4294f4423aa01d4216b4b4d48215c7946 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 183/223] Fix: Uniformise code From 348886e23b578dae4308d7b3ad2a79d91eccc18b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 184/223] Fix: update jstree plugin From 224b33c1ba2574fefc1e3e3eae5309a7b9226948 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 185/223] Fix: Upgrade detection fails From aa9d1eff9e885b839ebafce09918fd70975e765b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 186/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 39767c595e6f7d81a0d85e0628b77f0ad3d815d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 187/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 6415a00a1271998b739b08fcfc4d7044747fa89a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 188/223] Fix: Type of amount From d72cc745c6e9b134d70a676edf63e57f27a212a4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 189/223] Fix: Add civility for all peopal tables From f2dc8ad6b9b797300a1952605a9449d78f902445 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 190/223] Fix: Add civility for all peopal tables From 6c8d664f8c619ac0a774a6e136d5876da2660b01 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 191/223] Fix: Attachment fails if content was empty From fab09ad9df69e62d935f1796db145124f65fc0cb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 192/223] Work on packaging RPM & DEB From 52459bb7b5622c4450a1c52cd84b296efbf4b949 Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 193/223] Correction paiement Ajax From 286e9cd48cb3708a8e6695e83eec9d9f77fb7808 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 194/223] Trad: add translation From a2499d594a4f538c5c51c7c1f603845d2cac7f34 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 195/223] Fix: Removed install warning From ddf6a6dac9bb85bb80c5e8b5ef379f3e80a98040 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 196/223] Work on packaging RPM & DEB From 6dd2ecd099b989e102d07e8573a35cb1d260de41 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 197/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,30 +19,25 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia +# Requires for 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 @@ -100,17 +95,19 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 5cee6deafa3993ad5aa213699d3079df000ce1b7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 198/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 2be5eff1dd97fd7292d6b89bd3d3007e04476a51 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 199/223] Fix: Uniformise code From 468354ec990852e7c27b8f0771037b87789d4dc7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 200/223] Fix: update jstree plugin From 06b31a85a58f4af6c070a29b5276546102c4d5ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 201/223] Fix: Upgrade detection fails From 452100383c6b9a272d7662013353e11f99f64ba4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 202/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From e80d7bdf3a46f17533beaff368764734303598e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 203/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From d9770ca1752536e13e554caf977dd5f961ad25e8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 204/223] Fix: Type of amount From 8887447183ee18b5f51ccd1e76f437e979a5c3b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 205/223] Fix: Add civility for all peopal tables From 3ed98044248be973d1aebb5ecec6c506cc3ef9c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 206/223] Fix: Add civility for all peopal tables From f5822dd5671cbd8eae63fd617457425412ba0ed4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 207/223] Fix: Attachment fails if content was empty From 8e5dcf27ac8ff076c3a702719cc6b8bb5735f633 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 08:55:53 +0000 Subject: [PATCH 208/223] Work on packaging RPM & DEB From d0a87f6af42385bc979d5508a7133f97e69fbbb4 Mon Sep 17 00:00:00 2001 From: cdelambert Date: Mon, 11 Jul 2011 09:32:35 +0000 Subject: [PATCH 209/223] Correction paiement Ajax From a3a0635b9c6f4b5b3714beb2705f93cb658c3ae7 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 11 Jul 2011 10:41:29 +0000 Subject: [PATCH 210/223] Trad: add translation From f6961d2d2b467583db947b3fd58c67baf3fc7182 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 10:53:37 +0000 Subject: [PATCH 211/223] Fix: Removed install warning From 4eaa64d46adb127d0f4e89e94a81a10f7821eaef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 11:09:02 +0000 Subject: [PATCH 212/223] Work on packaging RPM & DEB From 63041e9d745f4a34b70984595ad2d981daffcf16 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 12:31:38 +0000 Subject: [PATCH 213/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 11090951bdd..44051435047 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,30 +19,25 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org +#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandriva-Mageia +# For Mandrake Group: Networking/WWW # For all other distrib Group: Applications/Internet -# Requires can use lua to be defined dynamically (but still at build time) -# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl -# Requires for Mandriva-Mageia +# Requires for 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 @@ -100,17 +95,19 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From 45d999d2d1a30aa35b8e5d06a79ea1175528809d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jul 2011 21:16:25 +0000 Subject: [PATCH 214/223] Work on packaging RPM & DEB --- build/rpm/dolibarr.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 44051435047..11090951bdd 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org -#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz #BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif -# For Mandrake +# For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet +# Requires can use lua to be defined dynamically (but still at build time) +# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end } + # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse #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 Mageia +# 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 @@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr -#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr From ee065f9a5d24dbf2c2b4c1a60301d5b5f7f549b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 07:17:11 +0000 Subject: [PATCH 215/223] Fix: Uniformise code From 2db91a9b61fa95ca78968a729005b1a9d146063c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jul 2011 08:07:59 +0000 Subject: [PATCH 216/223] Fix: update jstree plugin From bb6c345e10c446281f7547b3ecc61e9d28a01f67 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:16:03 +0000 Subject: [PATCH 217/223] Fix: Upgrade detection fails From dd03257f1b8d305284aff358cca6c48aa0c224e2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:48:08 +0000 Subject: [PATCH 218/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..0f6034488dd 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From 0037cc8ca0ebc7179dcfdcc24b9651f09f249daa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 20:52:41 +0000 Subject: [PATCH 219/223] Fix: Upgrade detection fails --- htdocs/install/check.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0f6034488dd..9de8cdf662d 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $ + * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ */ include_once("./inc.php"); @@ -393,7 +393,7 @@ else $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto); $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; - if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto; + if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; print ''.$langs->trans("Upgrade").'
'.$newversionfrom.' -> '.$newversionto.''; print ''; print $langs->trans("UpgradeDesc"); From f0a99a8cc4e63305abacc42b7d13e6f29bb2e549 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 21:07:24 +0000 Subject: [PATCH 220/223] Fix: Type of amount From bcabaf964b76e7be30f17c5c2b2630a102d51364 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:03:44 +0000 Subject: [PATCH 221/223] Fix: Add civility for all peopal tables From 2232506fe14a3f7279586bf936729db18237a2b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:12:12 +0000 Subject: [PATCH 222/223] Fix: Add civility for all peopal tables From 3f0f0cbdbadf9dc2dca7a6bee1e4f4276c4fd507 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jul 2011 22:19:02 +0000 Subject: [PATCH 223/223] Fix: Attachment fails if content was empty