cvsimport

COPYRIGHT

@@ -16,7 +16,6 @@ ArtiChow          1.07     Public Domain               Yes              Graphics
 CKEditor		  3.6.1	   GPL or LGPL 2.1 or MPL 1.1  Yes				Editor WYSIWYG
 EFC/XFSS		  1.0.1	   LGPL 3.0					   Yes				Enhanced File Crypt/Extended File Stealth System
 FCKEditor         2.6.6    LGPL 2.1 or Mozilla PL 1.0  Yes              Editor WYSIWYG
-Flot              0.7      MIT Licence                 Yes              JS library to build graph
 FPDF              1.6      Public domain               Yes              PDF generation (original code is modified)
 FPDF_TPL          1.1.5    Apache Software License 2.0 No GPL3 only     PDF templates management
 FPDI              1.3.4    Apache Software License 2.0 No GPL3 only     PDF templates management
@@ -24,6 +23,7 @@ FPDI_Protection   1.0.3    Apache Software License 2.0 No GPL3 only     PDF encr
 GeoIP             x.x                                  Yes              GeoIP Maxmind conversion
 jQuery            1.6.1    GPL and MIT Licence         Yes              JS library
 jQuery UI         1.8.14   GPL and MIT Licence         Yes              JS library plugin UI
+jQuery Flot       0.7      MIT Licence                 Yes              JS library to build graph
 jQuery JCrop      0.9.8    MIT Licence                 Yes              JS library plugin Crop (to crop images)
 jQuery Layout     1.3.0	   GPL and MIT Licence         Yes              JS library plugin Layout (RC-29.15)
 jQuery TableDnD   0.5      GPL and MIT Licence         Yes              JS library plugin TableDnD (to reorder table rows)

ChangeLog

@@ -1,6 +1,6 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.425 2011/07/29 10:55:22 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
@@ -74,6 +74,7 @@ For users:
 - New: Look: Minor enhancements into agenda view.
 - New: Look: Nicer tooltips with transparency and shadow.
 - New: task #11004: Create invoice from intervention.
+- New: task #10501: Can use point of sale with different bank accounts.
 - Fix: Better Postgresql compatibility.
 - Fix: Numbering module for invoices use same number for invoice 
        and credit note if mask is same.

build/.cvsignore

@@ -13,3 +13,7 @@ module_pibarcode-1.0.tgz
 version-phpsane.txt
 makepack-phpsane.conf
 html
+*.deb
+*.dsc
+*.tar.gz
+*.changes

build/aps/configure.php

@@ -1,11 +1,12 @@
+#!/usr/bin/php
 <?php
 /*-----------------------------------------------------
  *
  *----------------------------------------------------- */
 
-// This is list of predefined languages when script is ran.
+// This is list of predefined variables when script is ran
-// We set them manually for test purpose
+// We have to set them manually to run script outside context.
-putenv('SETTINGS_admin_name=admin');
+/*putenv('SETTINGS_admin_name=admin');
 putenv('SETTINGS_admin_password=admin-ad');
 putenv('BASE_URL_SCHEME=http');
 putenv('BASE_URL_HOST=localhost');
@@ -18,7 +19,7 @@ putenv('DB_main_HOST=localhost');
 putenv('DB_main_PORT=3306');
 putenv('DB_main_LOGIN=root');
 putenv('DB_main_PASSWORD=root');
-
+*/
 
 // Check parameters
 if(count($_SERVER['argv']) < 2)

build/deb/README

@@ -7,10 +7,19 @@ This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).
 
+# To build a debian package, you need first
+# apt-get -i debhelper 
+# apt-get -i dpkg-source 
+# apt-get -i gpg
+
 
 # This is standard command to work on Debian packaging:
 #
-# lintian package       To test a package   
+# gpg --gen-key                          Generate a GPG key
+#
+# debconf-updatepo					     To run into po dir to regenate templates.pot 
+#
+# lintian --pedantic -E -I package.deb   To test a package   
 #
 # dpkg -l                                List all packages
 # dpkg -b                                To build package
@@ -20,6 +29,8 @@ with format .DEB (for Debian, Ubuntu, ...).
 #
 # dpkg -L packagename                    List content of installed package 
 # dpkg --purge                           Remove config files and interactive saved answers
+#
+# dpkg-buildpackage -us -uc              Build a source and binary package
 
 
 To submit a package to Debian:
@@ -36,3 +47,7 @@ For first ITP submission of Dolibarr, bug id was 634783.
 - Add a line for upstream into file changelog with bug number
 
 - Call for a mentor on ML debian-mentors to upload packages
+
+- Once package is uploaded, following URL are available:
+http://packages.qa.debian.org/package.html
+http://bugs.debian.org/package

build/deb/README.debian

@@ -0,0 +1,103 @@
+README (english)
+--------------------------------
+Starter documentation
+--------------------------------
+
+1) Install Dolibarr
+2) Upgrade Dolibarr from an older version
+3) What's new in this version
+4) What Dolibarr can do
+5) What Dolibarr can't do yet, todo list
+
+
+I - DOLIBARR INSTALL
+--------------------
+
+Dolibarr files and its dependencies are automatically installed when you install
+the dolibarr Debian package.
+  
+Once package is installed, go on menu entry called Dolibarr or use your web browser
+to call page http://localhost/dolibarr
+
+
+
+II - DOLIBARR UPGRADE
+---------------------
+
+Dolibarr files and its dependencies are automatically upgraded when you install
+the dolibarr Debian package.
+
+Once new package is installed, go on menu entry called Dolibarr or use your web browser
+to call page http://localhost/dolibarr
+If a database upgrade is required, you will be prompted to. 
+
+  
+
+III - WHAT'S NEW
+----------------
+
+See ChangeLog file.
+
+
+
+IV - WHAT DOLIBARR CAN DO
+-------------------------
+
+Main modules/features:
+- Products and services catalog
+- Customers, Prospects or Suppliers directory
+- Address book
+- Stock management
+- Bank accounts management
+- Orders management with PDF export
+- Commercial proposals management with PDF export
+- Contracts management
+- Invoices management with PDF export
+- Payments management
+- Standing orders management
+- Shipping management
+- ECM (Electronic Content Management)
+- EMailings
+- Agenda with ical,vcal export for third tools integration
+- Management of foundation members
+- Donation management
+
+Other modules:
+- Bookmarks management
+- Can reports Dolibarr events inside Webcalendar or Phenix
+- Data export tools
+- LDAP connectivity
+- Third parties or products categories 
+- ClickToDial phone numbers
+- RSS
+
+Miscellanous:
+- Mutli-user, with several permissions levels for each feature.
+- Serveral menu managers (can be used by internal users, as a back-office,
+  with a particular menu, or by external users, as a front-office, with
+  another menu and permissions).
+- Very user friendly and easy to use.
+- Optional WYSIWYG forms, optional Ajax forms.
+- Several skins.
+- Code is highly customizable (a lot of use of modules and submodules).
+- Works with Mysql 3.1 or higher, experimental support for PostgreSql.
+- Works with PHP 4.3 or higher.
+- An easy to understand and maintain code (PHP with no heavy frameworks).
+- A trigger architecture to allow you to make Dolibarr business events run
+  PHP code to update your own information system.
+- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM 
+  called "Non Perçue Récupérable").
+
+
+
+V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
+------------------------------------------
+This is features that Dolibarr does not support completely yet:
+- Accountancy.
+- Dolibarr can manage only one currency.
+- Dolibarr does not support the double Canadian Tax.
+- Dolibarr does not make coffee (not yet).
+- Stock management with option increase/decrease on invoice works on
+  warehouse number one only (no way to choose warehouse).
+- Stock management with option increase/decrease on orders works on
+  warehouse number one only (no way to choose warehouse).

build/deb/apache.conf

@@ -65,6 +65,13 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
     Allow from all
 </DirectoryMatch>
 
+# Config files
+<DirectoryMatch /etc/dolibarr>
+	AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
 # Directory for data files
 <DirectoryMatch /usr/share/dolibarr/documents>
     AllowOverride All

build/deb/changelog

@@ -1,9 +1,9 @@
-dolibarr (3.1.0-1) unstable; urgency=low
+dolibarr (3.1.0-1.1) unstable; urgency=low
 
-  [ Laurent Destailleur ]
+  * Non-maintainer upload
   * New upstream release.
     closes: bug#634783
     
- -- Laurent Destailleur <eldy@destailleur.fr>  Mon, 18 Jul 2011 12:00:00 +0100     
+ -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 30 Jul 2011 12:00:00 +0100     
 
-# More information into /usr/share/dolibarr/ChangeLog file. 
+# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 

build/deb/compat

@@ -0,0 +1 @@
+7

build/deb/conf.php.install

@@ -0,0 +1,232 @@
+<?php
+# Dolibarr conf.php file
+#
+# Do not edit this file without changing its name.
+# This file is used by Dolibarr setup process to create true Dolibarr
+# config file called "conf.php".
+#
+# $Id: conf.php.install,v 1.1 2011/07/30 14:56:12 eldy Exp $
+
+
+###################
+# Main parameters #
+###################
+
+# dolibarr_main_url_root
+# This parameter defines the root URL of your Dolibarr index.php page.
+# It must link to the htdocs directory htdocs.
+# In most cases, this is autodetected but it still required to show full
+# url bookmarks for some services (ie: agenda rss export url, ...) or
+# when using Apache dir aliases (autodetect fails).
+# Examples:
+# $dolibarr_main_url_root='http://localhost';
+# $dolibarr_main_url_root='http://mydolibarrvirtualhost';
+# $dolibarr_main_url_root='http://myserver/dolibarr/htdocs';
+# $dolibarr_main_url_root='http://myserver/dolibarralias';
+#
+$dolibarr_main_url_root='http://localhost';
+
+
+# dolibarr_main_document_root
+# This parameter contains absolute file system directory of Dolibarr
+# htdocs directory
+# Examples:
+# $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
+# $dolibarr_main_document_root='C:/My web sites/dolibarr/htdocs';
+#
+$dolibarr_main_document_root='/usr/share/dolibarr/htdocs';
+
+
+# dolibarr_main_data_root
+# This parameter contains absolute file system directory of Dolibarr
+# directory used to store uploaded and generated physical files.
+# Examples:
+# $dolibarr_main_data_root='/var/www/dolibarr/documents';
+# $dolibarr_main_data_root='E:/My web sites/dolibarr/documents';
+#
+$dolibarr_main_data_root='/var/lib/dolibarr/documents';
+
+
+# dolibarr_main_db_host
+# This parameter contains host name or ip address of Dolibarr database
+# server.
+# Examples:
+# $dolibarr_main_db_host='localhost';
+# $dolibarr_main_db_host='127.0.0.1';
+# $dolibarr_main_db_host='192.168.0.10';
+# $dolibarr_main_db_host='mysql.myserver.com';
+#
+$dolibarr_main_db_host='127.0.0.1';
+
+
+# dolibarr_main_db_port
+# This parameter contains the port of the Dolibarr database.
+# Default value: none
+# Examples:
+# $dolibarr_main_db_host='3306';
+#
+$dolibarr_main_db_port='3306';
+
+
+# dolibarr_main_db_name
+# This parameter contains name of Dolibarr database.
+# Examples:
+# $dolibarr_main_db_name='dolibarr';
+# $dolibarr_main_db_name='mydatabase';
+#
+$dolibarr_main_db_name='dolibarr';
+
+
+# dolibarr_main_db_user
+# This parameter contains user name used to read and write into
+# Dolibarr database.
+# Examples:
+# $dolibarr_main_db_user='admin';
+# $dolibarr_main_db_user='dolibarruser';
+#
+$dolibarr_main_db_user='dolibarruser';
+
+
+# dolibarr_main_db_pass
+# This parameter contains password used to read and write into
+# Dolibarr database.
+# Examples:
+# $dolibarr_main_db_pass='myadminpass';
+# $dolibarr_main_db_pass='myuserpassword';
+#
+$dolibarr_main_db_pass='';
+
+
+# dolibarr_main_db_type
+# This parameter contains the name of the driver used to access your
+# Dolibarr database.
+# Default value: none
+# Possible values: mysql, mysqli, pgsql
+# Examples:
+# $dolibarr_main_db_type='mysql';
+# $dolibarr_main_db_type='mysqli';
+# $dolibarr_main_db_type='pgsql';
+#
+$dolibarr_main_db_type='mysqli';
+
+
+# dolibarr_main_db_character_set
+# Database character set used to store data (forced during database creation).
+# Default value: depends on database driver
+# Examples:
+# dolibarr_main_db_character_set='latin1';
+#
+$dolibarr_main_db_character_set='latin1';
+
+
+# dolibarr_main_db_collation
+# Database character set used to sort data (forced during database creation).
+# Default value: depends on database driver
+# Examples:
+# dolibarr_main_db_collation='latin1_swedish_ci';
+#
+$dolibarr_main_db_collation='latin1_swedish_ci';
+
+
+
+##################
+# Login          #
+##################
+
+# dolibarr_main_authentication
+# This parameter contains the way authentication is done.
+# If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_*
+# Default value: dolibarr
+# Possible values: Any values found in files in htdocs/includes/login directory after
+# the "function_" string and before the ".php" string. You can also separate several
+# values using a ",". In this case, Dolibarr will check login/pass for each value in 
+# order defined into value. However, note that this can't work with all values.
+# Examples:
+# $dolibarr_main_authentication='http';
+# $dolibarr_main_authentication='dolibarr';
+# $dolibarr_main_authentication='ldap';
+# $dolibarr_main_authentication='openid,dolibarr';
+#
+$dolibarr_main_authentication='dolibarr';
+
+
+# Parameters used to setup LDAP authentication.
+# Uncomment them if dolibarr_main_authentication = 'ldap'
+#
+# $dolibarr_main_auth_ldap_host='127.0.0.1';
+# $dolibarr_main_auth_ldap_port='389';
+# $dolibarr_main_auth_ldap_version='3';
+# $dolibarr_main_auth_ldap_servertype='openldap';			# openldap, activedirectory or egroupware
+# $dolibarr_main_auth_ldap_login_attribute='loginfield';	   # Ex: uid or samaccountname for active directory
+# $dolibarr_main_auth_ldap_dn='ou=users,dc=my-domain,dc=com';  # Ex: ou=users,dc=my-domain,dc=com
+# $dolibarr_main_auth_ldap_filter = '';                        # If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
+# $dolibarr_main_auth_ldap_admin_login='';					# Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
+# $dolibarr_main_auth_ldap_admin_pass='';					# Required only if anonymous bind disabled. Ex: secret
+
+# $dolibarr_main_auth_ldap_debug='false';
+
+
+# dolibarr_main_demo
+# Login and pass to use in a demo mode
+# Default value: ''
+# Examples:
+# $dolibarr_main_demo='autologin,autopass'
+
+
+
+##################
+# Security       #
+##################
+
+# dolibarr_main_force_https
+# This parameter allows to force the HTTPS mode.
+# Warning: If you enable this parameter, your web server must be configured
+# to respond URL with https protocol.
+# Default value: 0
+# Possible values: 0 or 1
+# Examples:
+# $dolibarr_main_force_https='0';
+#
+$dolibarr_main_force_https='0';
+
+# dolibarr_nocsrfcheck
+# This parameter can be used to disable CSRF protection.
+# This might be required if you access Dolibarr behind a proxy that make
+# URL rewriting to avoid false alarms.
+# Default value: 0
+# Possible values: 0 or 1
+# Examples:
+# $dolibarr_nocsrfcheck='0';
+#
+$dolibarr_nocsrfcheck='0';
+
+# dolibarr_main_prod
+# When this parameter is defined, all errors messages are not reported.
+# This feature exists for production usage to avoid to give any information to hackers.
+# Default value: 0
+# Possible values: 0 or 1
+# Examples:
+# $dolibarr_main_prod='0';
+#
+$dolibarr_main_prod='0';
+
+
+
+##################
+# Other          #
+##################
+
+# dolibarr_main_limit_users
+# Can set a limit on the number of users it will be possible to create
+# (the superadmin not included), can be used for a restricted mode.
+# Default value: 0 (unlimited)
+# Examples:
+# $dolibarr_main_limit_users='0';
+
+# dolibarr_mailing_limit_sendbyweb
+# Can set a limit for mailing send by web, can be used for a restricted mode.
+# Default value: 0 (use database value if exist)
+# Examples:
+# $dolibarr_mailing_limit_sendbyweb='0';
+
+?>

build/deb/control.DEBIAN

@@ -2,14 +2,12 @@ Package: dolibarr
 Version: __VERSION__
 Architecture: all
 Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Essential: no
 Installed-Size: 61200
-Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl
+Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
 Section: web
 Priority: optional
-Recommends: firefox
 Homepage: http://www.dolibarr.org
-Description: Easy to use ERP & CRM software to manage your activity.
+Description: Easy to use web based ERP & CRM software
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
@@ -21,29 +19,28 @@ Description: Easy to use ERP & CRM software to manage your activity.
  Only features you need are visible, depending on which module were activated.
  Most common used modules are:
  .
- Customers, Suppliers or Prospects directory
+ Customers, Suppliers or Prospects directory,
- Contacts directory
+ Contacts directory,
- Orders management
+ Orders management,
- Commercial proposals management
+ Commercial proposals management,
- Invoices management
+ Invoices management,
- Products and services catalog
+ Products and services catalog,
- Stock management
+ Stock management,
- Foundations members management
+ Foundations members management,
- Bank accounts management
+ Bank accounts management,
- Point of Sale
+ Point of Sale,
- Payments management
+ Payments management,
- Commercial actions management
+ Commercial actions management,
- Contracts management
+ Contracts management,
- Standing orders management
+ Standing orders management,
- Shipping management
+ Shipping management,
- Donations management
+ Donations management,
- Bookmarks management
+ Bookmarks management,
- Mass Emailings
+ Mass Emailings,
- Reports
+ Reports,
- Data export and import tools
+ Wizards to export and import data,
- LDAP connectivity
+ LDAP connectivity,
- PDF exports
+ PDF exports,
  And a lot of more modules...
  .
  You can also add third parties external modules or develop yours.
- 

build/deb/control.debian

@@ -0,0 +1,51 @@
+Source: dolibarr
+Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Standards-Version: 3.9.1
+Section: web
+Priority: optional
+Homepage: http://www.dolibarr.org
+Build-Depends: debhelper, po-debconf
+
+Package: dolibarr
+Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
+Architecture: all
+Section: web
+Priority: optional
+Homepage: http://www.dolibarr.org
+Description: Easy to use web based ERP & CRM software
+ Dolibarr ERP & CRM is an easy to use open source/free software for small 
+ and medium companies, foundations or freelances. It includes different 
+ features for Enterprise Resource Planning (ERP) and Customer Relationship
+ Management (CRM) but also for different other activities.
+ It's a web software you can install as a standalone program or on any web
+ hosting provider to use it from anywhere with any web browser.
+ Dolibarr was designed to provide only features you need and be easy to use.
+ .
+ Only features you need are visible, depending on which module were activated.
+ Most common used modules are:
+ .
+ Customers, Suppliers or Prospects directory,
+ Contacts directory,
+ Orders management,
+ Commercial proposals management,
+ Invoices management,
+ Products and services catalog,
+ Stock management,
+ Foundations members management,
+ Bank accounts management,
+ Point of Sale,
+ Payments management,
+ Commercial actions management,
+ Contracts management,
+ Standing orders management,
+ Shipping management,
+ Donations management,
+ Bookmarks management,
+ Mass Emailings,
+ Reports,
+ Wizards to export and import data,
+ LDAP connectivity,
+ PDF exports,
+ And a lot of more modules...
+ .
+ You can also add third parties external modules or develop yours.

build/deb/copyright

@@ -7,12 +7,22 @@ Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2003-2011, Laurent Destailleur    <eldy@users.sourceforge.net>
            2004-2011, Regis Houssin          <regis@dolibarr.fr>
-           2003, Jean-Louis Bergamo          <jlb@j1b.org>
+           2006-2011, Auguria SARL           <info@auguria.org>
+           2010-2011, Juanjo Menent          <jmenent@2byte.es>
+           2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
+           2003, Xavier Dutoit               <doli@sydesy.com>
            2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
            2004, Benoit Mortier              <benoit.mortier@opensides.be>
            2004, Christophe Combelles        <ccomb@free.fr>
+           2004, Eric Seigne                 <eric.seigne@ryxeo.com>
+           2005, Patrick Rouillon            <patrick@rouillon.net>
+           2005, Marc Barilley / Ocebo       <marc@ocebo.com>
+           2006, Andre Cianfarani            <acianfa@free.fr>
+           2006, Jean Heimburger             <jean@tiaris.info>
+           2007, Patrick Raguin              <patrick.raguin@gmail.com>
+           2007-2008, Jeremie Ollivier       <jeremie.o@laposte.net>
            2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
-           2010-2011, Juanjo Menent          <jmenent@2byte.es>
+           2010, Servitux Servicios Informaticos <info@servitux.es>
  License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -34,3 +44,35 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+ 
+ 
+Files: htdocs/includes/artichow/*
+License: Public Domain
+
+Files: htdocs/includes/ckeditor/*
+License: GPL-2+
+
+Files: htdocs/includes/efc_xfss/*
+License: GPL-2+
+
+Files: htdocs/includes/fckeditor/*
+License: GPL-2+
+
+Files: htdocs/includes/magpierss/*
+License: GPL-2+
+
+Files: htdocs/includes/jquery/*
+License: GPL-2+ or MIT
+
+Files: htdocs/includes/jsgantt/*
+License: GPL-2+
+
+Files: htdocs/includes/phpwrite_excel/*
+License: LGPL 2.1
+
+Files: htdocs/includes/odtphp/*
+License: GPL-2+
+
+Files: htdocs/includes/tcpdf/*
+License: LGPL 3.0
+ 

build/deb/docs

@@ -1 +0,0 @@
-doc/*

build/deb/dolibarr.desktop

@@ -2,7 +2,6 @@
 # This file is used to add Ubuntu menu entry
 # It must be saved into directory /usr/share/applications
 Version=1.0
-Encoding=UTF-8
 Name=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
@@ -10,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
 # Command to open an URL
 # For Fedora: xdg-open 
-# For Debian/Ubuntu: x-www-browser
+# For Debian/Ubuntu: xdg-open or x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
-Exec=x-www-browser http://localhost/dolibarr
+Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application

build/deb/examples

@@ -1 +0,0 @@
-usr/share/dolibarr/htdocs/conf/conf.php.example

build/deb/files

@@ -1,2 +0,0 @@
-etc
-usr

build/deb/format

@@ -0,0 +1 @@
+1.0

build/deb/install

@@ -0,0 +1,5 @@
+etc/dolibarr/apache.conf
+usr/share/applications/dolibarr.desktop
+usr/share/doc/dolibarr
+usr/share/dolibarr
+usr/share/pixmaps

build/deb/install.forced.php.install

@@ -4,19 +4,19 @@
 // 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.9 2011/07/30 14:56:12 eldy Exp $
 //
 
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
-$force_install_main_data_root='/usr/share/dolibarr/documents';
+#$force_install_main_data_root='/usr/share/dolibarr/documents';
-#$force_install_main_data_root='/var/lib/dolibarr';
+$force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
 $force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarr';
+$force_install_database='dolibarrdebian';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrmysql';
+$force_install_databaselogin='dolibarrdebian';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';

build/deb/menu

@@ -1,3 +0,0 @@
-# This file seems to be useless for Ubuntu
-# Good way to add menu on Ubuntu is adding file dolibarr.desktop
-text Apps/Misc dolibarr none "Dolibarr ERP/CRM" rundolibarr.sh

build/deb/po/POTFILES.in

@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates

build/deb/po/fr.po

@@ -0,0 +1,48 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-27 19:49+0200\n"
+"PO-Revision-Date: 2011-07-29 22:45+0100\n"
+"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
+"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Project-Id: dolibarr\n"
+
+#
+#. Type: boolean
+#. Description
+#: ../templates:1001
+#, fuzzy
+msgid "Delete database and uploaded files ?"
+msgstr "Effacer la base de donnée et les fichiers uploadés ?"
+
+#
+#. Type: boolean
+#. Description
+#: ../templates:1001
+#, fuzzy
+msgid ""
+"Answer if you want to removed the Dolibarr MySQL database and all other "
+"datas (datas related to this question are the Dolibarr DBMS account, all "
+"Dolibarr tables, and all uploaded files)."
+msgstr ""
+"Indiquez si vous voulez supprimer la base Dolibarr et toutes ces données "
+"(les données en question ici sont les comptes de la base, les tables et tous "
+"les fichiers téléchargés)."

build/deb/po/templates.pot

@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-27 19:52+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Delete database and uploaded files ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Answer if you want to removed the Dolibarr MySQL database and all other "
+"datas (datas related to this question are the Dolibarr DBMS account, all "
+"Dolibarr tables, and all uploaded files)."
+msgstr ""

build/deb/postinst

@@ -23,18 +23,32 @@ db_version 2.0
 
 echo Run the dolibarr postinst script
 
+
+# Define vars
+docdir='/var/lib/dolibarr/documents'
+#docdir='/usr/share/dolibarr/documents'
+apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
+apacheconfig="/etc/dolibarr/apache.conf"
+installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
+installconfig="/etc/dolibarr/install.forced.php"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="/etc/dolibarr/conf.php"
+
+
 case "$1" in
 	configure)
 
-		# Copy apache.conf file into target directory
+        # Create document directory for uploaded data files
-		fileorig="/usr/share/dolibarr/build/deb/apache.conf"
+        mkdir -p $docdir
-		config="/etc/dolibarr/apache.conf"
+        chown -R www-data:www-data $docdir
-		mkdir -p /etc/dolibarr
+        chmod -R 775 $docdir
-		cp -p $fileorig $config
+        chmod -R g+s $docdir
 
-		# Create install.forced.php into Dolibarr install directory
+		# Copy apache.conf file into target directory
-		fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
+		#mkdir -p /etc/dolibarr
-		config="/usr/share/dolibarr/htdocs/install/install.forced.php"
+		#cp -p $apachefileorig $apacheconfig
+
+		# Copy install config file (with matching Debian) values into target directory
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -44,31 +58,24 @@ case "$1" in
 		fi
 		echo Mysql superuser found to use is $superuserlogin
 		if [ -z "$superuserlogin" ] ; then
-			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
+			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
 		else
-			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
+			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
 		fi
-		
+		chown -R root:www-data $installconfig
-        # Create document directory
+	   	chmod -R 660 $installconfig
-        #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 ]
+		if [ ! -f $config ]
 		then 
-			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
+			echo Create empty file $config		
-			touch /usr/share/dolibarr/htdocs/conf/conf.php
+			touch $config
-			chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
+			chown -R root:www-data $config
-	    	chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
+	    	chmod -R 660 $config
 		fi
 
-		#db_reset "dolibarr/webserver"
-
 		# Get the web server type (use db_get for interactive mode).
+		#db_reset "dolibarr/webserver"
 		#db_get "dolibarr/webserver"		# Read value for webserver.
 		#webserver="$RET"
 
@@ -96,12 +103,9 @@ case "$1" in
 
 			echo Web user.group used is $webuser.$webgroup
 
-			#
+			# Set permissions to web server
-			# That may lead to problems if apache & apache-ssl do
-			# not have the same user/group.
-			#
 			chown -R $webuser:$webgroup /usr/share/dolibarr
-            chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
+            chown -R root:$webgroup $config
 
 			# Add link to config file
             echo Setup web server $server to add dolibarr config file
@@ -109,26 +113,6 @@ case "$1" in
 			
 		done
 
-		#echo "Install menu entry"
-		# This one is for Gnome ubuntu
-		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
-		#target="/usr/share/applications/"
-		#cp -f $fileorig $target
-		# Not sure this is usefull
-		#if test -x /usr/bin/update-menus; then 
-		#	echo "update-menus"
-		#	update-menus;
-		#fi
-		
-		# TODO Create the file to force parameters in Web installer
-		#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
-		#then
-		#    perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#    perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#    perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#    perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#fi
-
 		# Restart servers
 		servers="apache2-ssl apache2 mysql"
 		# Another way to restart

build/deb/postrm

@@ -23,13 +23,17 @@ db_version 2.0
 
 echo Run the dolibarr postrm script
 
-#echo "postrm db_get dolibarr/webserver"
-# We disable set -e to avoid premature end of script if error
-set +e
-#db_get "dolibarr/webserver" || true
-set -e
-export webserver="$RET"
 
+docdir='/var/lib/dolibarr/documents'
+#docdir='/usr/share/dolibarr/documents'
+apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
+apacheconfig="/etc/dolibarr/apache.conf"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="/etc/dolibarr/conf.php"
+lockfile="/usr/share/dolibarr/install.lock"
+
+
+export webserver=""
 # Allows us to loop and substitute in one pass
 case $webserver in
 	Apache)		webservers="apache2" ;;
@@ -37,12 +41,38 @@ case $webserver in
 	Both)		webservers="apache2 apache2-ssl" ;;
 	*)		    webservers="apache2 apache2-ssl" ;;
 esac
-export includefile=/etc/dolibarr/apache.conf
+
 
 case "$1" in
+
+    # Call when we upgrade
+	upgrade)
+	;;
+
+    # Call when we uninstall
+	remove)
+		rm -f $lockfile
+
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete link $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+	;;
+
     # Call when we uninstall and purge
 	purge)
-		echo "postrm purge webservers=$webservers includefile=$includefile"
+		echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
 
 		# Ask if we must delete database
 		echo "postrm db_input dolibarr/postrm"
@@ -59,7 +89,8 @@ case "$1" in
 			echo postrm Mysql database deletion
 			# Get database configuration
 			dbserver="localhost"
-			dbname="dolibarrmysql"
+			dbuser="dolibarrdebian"
+			dbname="dolibarrdebian"
 			#db_get "dolibarr/db/name"
 			#dbname="$RET"
 			superuserlogin=''
@@ -120,6 +151,14 @@ case "$1" in
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
 
+		    # Now run the drop user
+			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
+				echo Database login $dbuser removed
+			else
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
+				echo $error
+			fi
+
 		    # Now run the drop commands
 		    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
 				log="${log}Droping database $dbname."
@@ -139,21 +178,25 @@ case "$1" in
 				log="${log}Database $dbname already not exists."
 		    fi
 
+		    echo "Remove directory $docdir"
+		    rm -rf $docdir ; 
+ 
 		else
-			echo "postrm Delete of dolibarr database not wanted" 
+			echo "postrm Delete of dolibarr database and uploaded files not wanted" 
 		fi
 	
 		# Remove include files
+		export restart=""
 		for server in $webservers ; do
-			# New usage
 			export conffile="/etc/$server/conf.d/dolibarr.conf"
             if [ -f $conffile ] ;
             then
+               echo Delete file $conffile
 	           rm -f $conffile
 	           status=purge
 		    fi
 			
-			if [ "$status" = "purge" ] ;
+			if [ "x$status" = "xpurge" ] ;
 				then restart="$restart $server"
 			fi
 		done
@@ -161,7 +204,7 @@ case "$1" in
 		rm -rf /etc/dolibarr
 
 		# Restart servers
-		for server in $servers ; do
+		for server in $restart ; do
             # We disable blocking errors
             set +e
             echo "Restart server $server if exists"
@@ -174,47 +217,12 @@ case "$1" in
     		set -e
 		done
 		
-		# Remove file and conf file
-		for dir in /usr/share/dolibarr ; do
-			if [ -d $dir ] ; then 
-                # We disable blocking errors
-                set +e
-			    echo "Remove directory $dir"
-			    rm -rf $dir ; 
-                # We restore blocking errors
-                set -e
-			fi
-		done
-		
 		# We clean variable (we ignore errors because db_reset can fails if var was never set)
         set +e
 		db_reset "dolibarr/postrm"
         set -e
 
-		db_purge
+		#db_purge
-	;;
-
-    # Call when we uninstall
-	remove)
-		echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
-		rm -fr /usr/share/dolibarr/htdocs/install
-
-        echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
-        rm -fr /usr/share/dolibarr/htdocs/conf
-
-		#echo "postrm Remove menu entry and image"
-		#fileorig="/usr/share/applications/dolibarr.desktop"
-		#rm -f $fileorig
-		#fileorig="/usr/share/pixmaps/dolibarr.xpm"
-		#rm -f $fileorig
-		# Not sure this is usefull
-        #if test -x /usr/bin/update-menus; then 
-        #   echo "update-menus"
-        #   update-menus;
-        #fi
-	;;
-
-	upgrade)
 	;;
 
 	failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -226,8 +234,8 @@ case "$1" in
 	;;
 esac
 
-db_stop
-
 #DEBHELPER#
 
+db_stop
+
 exit 0

build/deb/rules

@@ -1,4 +1,10 @@
-#
+#!/usr/bin/make -f
-# Sample debian/rules
+
-#
+# Uncomment this to turn on verbose mode.
-# This script is not used, so is empty.
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
+
+#export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
+
+%:
+	dh $@

build/deb/templates

@@ -1,7 +1,7 @@
 Template: dolibarr/postrm
 Type: boolean
 Default: true
-Description: Delete database ?
+_Description: Delete database and uploaded files ?
- Delete the Dolibarr MySQL database and all its datas (datas related
+ Answer if you want to removed the Dolibarr MySQL database and all other
- to this quetion are the Dolibarr DBMS account and all
+ datas (datas related to this question are the Dolibarr DBMS account, all
- Dolibarr tables) ?
+ Dolibarr tables, and all uploaded files).

build/exe/doliwamp/doliwamp.iss

@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
+; Version: $Id: doliwamp.iss,v 1.83 2011/07/28 10:29:49 eldy Exp $
 ;----------------------------------------------------------------------------------------
 
 
@@ -112,7 +112,7 @@ Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,fpdf\*,initdemo\*,iso-normes\*,samples\*,test\*,uml\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
-Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
+Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 ; Config files
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;

build/exe/doliwamp/install.forced.php.install

@@ -4,9 +4,9 @@
 // This file must be present into htdocs/install directory
 // during install process to be used.
 //
-// $Id: install.forced.php.install,v 1.15 2011/06/26 01:52:59 eldy Exp $
+// $Id: install.forced.php.install,v 1.16 2011/07/30 14:56:12 eldy Exp $
 //
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
 $force_install_type='mysqli';

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.111 2011/07/21 01:20:31 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="1";
-$BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD
 
 @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
 $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
-$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
 $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
 $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 if (-d "/usr/src/redhat") {
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.111 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -248,43 +248,74 @@ if ($nboftargetok) {
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/pom.xml`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/default.properties`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
 
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
+	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/install.lock`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/AerialMono*.ttf`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Tymes*.ttf`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
 	    
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
+
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS*  $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
+	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
+	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
 	}
     
     # Build package for each target
@@ -383,14 +414,19 @@ if ($nboftargetok) {
     	}
     
     	if ($target eq 'RPM') {                 # Linux only
-    		$ARCH='i386';
+    		#$ARCH='i386';
+    		$ARCH='noarch';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
            	$newbuild = $BUILD;
-            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+           	# For fedora
-            $newbuild =~ s/beta/1/gi;						# beta
+            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
-            $newbuild =~ s/rc./2/gi;						# rc
+            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
+            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
             if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            # now newbuild is 0-0 or 0-3 for example
+            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            #$newbuild =~ s/beta/1/gi;						# beta
+            #$newbuild =~ s/rc./2/gi;						# rc
+            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
             $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
             if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
             print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -408,6 +444,16 @@ if ($nboftargetok) {
 
  			print "Remove other files\n";
             $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
 
     		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
     		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
@@ -436,10 +482,15 @@ if ($nboftargetok) {
    		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
    		    $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
     		$ret=`$cmd`;
+   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
+   		    $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
+    		$ret=`$cmd`;
+
     		next;
     	}
     	
-    	if ($target eq 'DEB') {
+    	if ($target eq 'DEB') 
+    	{
             $newbuild = $BUILD;
             $newbuild =~ s/(dev|alpha)/1/gi;                # dev
             $newbuild =~ s/beta/2/gi;                       # beta
@@ -447,9 +498,12 @@ if ($nboftargetok) {
             if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale
             # now newbuild is 0-1 or 0-4 for example
             print "Version is $MAJOR.$MINOR.$newbuild\n";
+            $build = $newbuild;
+            $build =~ s/-.*$//g;
+			# now build is 0 for example
 			
-    		print "Remove target $FILENAMEDEB.deb...\n";
+    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
-    		unlink("$DESTI/$FILENAMEDEB.deb");
+    		unlink("$DESTI/${FILENAMEDEB}_all.deb");
 
             #rmdir "$BUILDROOT/$PROJECT.tmp";
     		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
@@ -458,44 +512,20 @@ if ($nboftargetok) {
     		print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
     		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
             $ret=`$cmd`;
+            
+            # Create DEBIAN directory
     		print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
     		$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-    		print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+    		print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
-            $ret=`cp -r "$SOURCE/build/deb/config"    "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/config"           "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/control"   "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/postinst"         "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/postinst"  "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/postrm"           "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/postrm"    "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/templates"        "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -fr "$SOURCE/build/deb/po"              "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
- 
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
- 			print "Remove other files\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/spec`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/uml`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/xdebug`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/rollup`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/test`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
-		    
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            # To remove once stable
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
             
             print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
-            open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error";
+            open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error";
             open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
             while (<SPECFROM>) {
                 $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
@@ -505,11 +535,85 @@ if ($nboftargetok) {
             close SPECTO;
             print "Version set to $MAJOR.$MINOR.$newbuild\n";
             
+ 			print "Remove other files\n";
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
+            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/rollup`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/test`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fpdf/fpdf`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`;
+		    
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
+            # To remove once stable
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
+
+			# Apache conf files
+    		print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
+    		$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
+
+			# Dolibarr conf files
+			# TODO
+
+			# dolibarr.desktop
 	   		print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
     		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
     		print "Copy desktop file into $BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop\n";
     		$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop"`;
             
+            # pixmap
 	   		print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps\n";
     		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/pixmaps"`;
     		print "Copy pixmap file into $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm\n";
@@ -518,14 +622,16 @@ if ($nboftargetok) {
             print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
             $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
             
-    		print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
-            $ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
 
-    		print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+			# copyright (to build binary package directly without sources. Useless if we build from sources)
-            $ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+    		#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+            #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
 
-            #$ret=`gzip -9 -c $SOURCE/build/deb/changelog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            # changelog (to build binary package directly without sources. Useless if we build from sources)
-            $ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
 
             print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
@@ -538,34 +644,84 @@ if ($nboftargetok) {
             $ret=`$cmd`;
             $ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/control`;
             $ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.php -type f -exec chmod 755 {} \\; ";
+            $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 {} \\; ";
+            $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 {} \\; ";
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/translation/langAutoParser.class.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_page.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/modMyModule.class.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_class.class.php`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
             
      		print "Go to directory $BUILDROOT\n";
             $olddir=getcwd();
      		chdir("$BUILDROOT");
  
-    		$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb";
+            # Creation of binary package (to build without sources)
+    		#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
+    		#print "Launch DEB build ($cmd)\n";
+    		#$ret=`$cmd`;
+    		#print $ret."\n";
+
+            # Creation of source package
+            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
+            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
+            print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+            # Add files for dpkg-source
+            $ret=`cp -f  "$SOURCE/ChangeLog"                "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
+            $ret=`cp -f  "$SOURCE/build/deb/README.debian"  "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
+            $ret=`cp -f  "$SOURCE/build/deb/changelog"      "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
+            $ret=`cp -f  "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
+            $ret=`cp -f  "$SOURCE/build/deb/install"        "$BUILDROOT/$PROJECT.tmp/debian/install"`;
+            $ret=`cp -f  "$SOURCE/build/deb/rules"          "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
+            $ret=`cp -f  "$SOURCE/build/deb/copyright"      "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
+            $ret=`cp -f  "$SOURCE/build/deb/compat"         "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
+            $ret=`cp -f  "$SOURCE/build/deb/format"         "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
+            $ret=`cp -fr "$SOURCE/build/deb/po"             "$BUILDROOT/$PROJECT.tmp/debian/po"`;
+			$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
+            # Add files also required to build binary package with dpkg-buildpackages
+            $ret=`cp -f  "$SOURCE/build/deb/config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/deb/postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/deb/postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/deb/templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+            
+            $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+            $ret=`$cmd`;
+            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
+            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+            $cmd="dpkg-buildpackage -us -uc";
             print "Launch DEB build ($cmd)\n";
             $ret=`$cmd`;
             print $ret."\n";
+
             chdir("$olddir");
     		
             if ($OS =~ /windows/i)
             {
-                print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
+                print "Move *_all.deb to $DESTI\n";
-                $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
+                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
             }
             else
             {
-                print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
+                print "Move *_all.deb to $DESTI\n";
-                $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
+                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
             }
         	next;
         }
@@ -593,15 +749,21 @@ if ($nboftargetok) {
             $ret=`$cmd`;
 
             print "Remove other files\n";
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/dbmodel`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/fpdf`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/initdata`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/iso-normes`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpcheckstyle`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpunit`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/spec`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/uml`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/xdebug`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/flyer`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/font`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/tshirt`;

build/rpm/README

@@ -22,14 +22,18 @@ with format RPM (for Redhat, Mandriva, ...).
 # On Mageia (after su - root)
 # urpmi dolibarr-...rpm             To install package and dependencies
 # urpme dolibarr                    To remove package
+#
+# More on rpm on page http://www.trustonme.net/didactels/273.html
 
 
 To submit a package to Fedora:
-
+- Create account on bugzilla.redhat.com
+- Create account on fedoraproject.org
+- Create SRPMS package.
+- Upload package onf http://fedorapeople.org
 - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review
 This is example of content of review field (used for Bug 723326):
-Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec
+SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm
-SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm
 Description:  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

build/rpm/dolibarr.desktop

@@ -13,7 +13,7 @@ Comment[it]=Programma gestionale open source e gratuito per piccole e medie impr
 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
+# For Debian/Ubuntu: xdg-open or x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
 Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr

build/rpm/dolibarr.spec

@@ -20,7 +20,7 @@ Vendor: Dolibarr dev team
 
 URL: http://www.%{name}.org
 Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
-#BuildArch: noarch
+BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: /tmp/%{name}-buildroot
 #Icon: dolibarr_logo1.gif
@@ -138,23 +138,61 @@ rm -rf $RPM_BUILD_ROOT
 #%config /var/www/dolibarr/htdocs/conf/conf.php
 
 
-#---- post (after install)
+#---- post (after unzip during install)
 %post
-%update_menus
+#%update_menus	# Does not exists on fedora nor mandriva
 
+
+# Define vars
 # 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 
+# Dolibarr uploaded files and generated documents will be stored into docdir 
-export docdir='/usr/share/dolibarr/documents'
+#export docdir="/var/lib/dolibarr/documents"
+export docdir="/usr/share/dolibarr/documents"
+export installfileorig="$targetdir/build/rpm/install.forced.php.install"
+export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
+export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
+export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="%{_sysconfdir}/dolibarr/conf.php"
+lockfile="/usr/share/dolibarr/install.lock"
+
+
+# Detect OS
+os='unknown';
+if [ -d %{_sysconfdir}/httpd/conf.d ]; then
+    export os='fedora-redhat';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+    export os='opensuse';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='wwwrun';
+    export apachegroup='www';
+fi
+if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+    export os='mageia-mandriva';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
+    export os='ubuntu-debian';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='www-data';
+    export apachegroup='www-data';
+fi
+echo OS detected: $os
 
 
 # Create empty directory for uploaded files and generated documents 
 echo Create document directory $docdir
 mkdir -p $docdir
+mkdir -p %{_sysconfdir}/dolibarr
 
 # Create install.forced.php into Dolibarr install directory
-fileorig="$targetdir/build/rpm/install.forced.php.install"
-config="$targetdir/htdocs/install/install.forced.php"
 superuserlogin=''
 superuserpassword=''
 if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
@@ -164,72 +202,47 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
 fi
 echo Mysql superuser found to use is $superuserlogin
 if [ -z "$superuserlogin" ] ; then
-    cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
+    cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
 else
-    cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
+    cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+fi
+chown -R root:$apachegroup $installconfig
+chmod -R 660 $installconfig
+
+# Create an empty conf.php with permission to web server
+if [ ! -f $config ]
+then 
+	echo Create empty file $config		
+	touch $config
+	chown -R root:$apachegroup $config
+	chmod -R 660 $config
 fi
 
-# Create a config file %{_sysconfdir}/dolibarr/apache.conf
+# Create a config file $apacheconfig
-if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then
+if [ ! -f $apacheconfig ]; then
-  	 echo Create dolibarr web server config file %{_sysconfdir}/dolibarr/apache.conf
+  	 echo Create dolibarr web server config file $apacheconfig
-     mkdir -p %{_sysconfdir}/dolibarr
+     cp $apachefileorig $apacheconfig
-     cp $targetdir/build/rpm/httpd-dolibarr.conf %{_sysconfdir}/dolibarr/apache.conf
+     chmod a-x $apacheconfig
-     chmod a-x %{_sysconfdir}/dolibarr/apache.conf
+     chmod go-w $apacheconfig
-     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
+if [ ! -f $apachelink ]; then
-    echo Create dolibarr web server config link $conffile
+    echo Create dolibarr web server config link $apachelink
-    ln -fs /etc/dolibarr/apache.conf $conffile
+    ln -fs $apacheconfig $apachelink
 fi
 
 # Set permissions
 echo Set permission to $apacheuser:$apachegroup on $targetdir
 chown -R $apacheuser:$apachegroup $targetdir
 chmod -R a-w $targetdir
+chmod u+w $targetdir
 
 echo Set permission to $apacheuser:$apachegroup on $docdir
 chown -R $apacheuser:$apachegroup $docdir
 chmod -R o-w $docdir
 
-# Create empty conf.php file for web installer
+# Set SE Linux on OS SE is enabled
-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
-    chmod ug+rw $targetdir/htdocs/conf/conf.php
-fi
-
 if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
     echo Set SELinux permissions
     # Warning: chcon seems not cumulative 
@@ -237,6 +250,7 @@ if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
     #chcon -R -h -t httpd_sys_content_t $docdir
     chcon -R -h -t httpd_sys_script_rw_t $targetdir
     chcon -R -h -t httpd_sys_script_rw_t $docdir
+    chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr
     #chcon -R -h -t httpd_sys_script_exec_t $targetdir
 fi
 
@@ -253,57 +267,71 @@ fi
 echo
 echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
 echo "Dolibarr files are now installed (into /var/www/dolibarr)."
-echo To finish installation and use Dolibarr, call the following
+echo "To finish installation and use Dolibarr, click on ne menu" 
-echo page from your web browser:  
+echo "entry Dolibarr ERP-CRM or call the following page from your"
-echo http://localhost/dolibarr/
+echo "web browser:"  
+echo "http://localhost/dolibarr/"
+echo "--------------------------------------------------"
 echo
 
 
-
 #---- postun (after uninstall)
 %postun
-%clean_menus
+#%clean_menus	# Does not exists on fedora nor mandriva
+
+
+# Define vars
+# Dolibarr files are stored into targetdir
+export targetdir='/var/www/dolibarr'
+# Dolibarr uploaded files and generated documents will be stored into docdir 
+#export docdir="/var/lib/dolibarr/documents"
+export docdir="/usr/share/dolibarr/documents"
+export installfileorig="$targetdir/build/rpm/install.forced.php.install"
+export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
+export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
+export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="%{_sysconfdir}/dolibarr/conf.php"
+lockfile="$targetdir/install.lock"
+
 
 # Detect OS
 os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
     export os='fedora-redhat';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
     export apacheuser='apache';
     export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
     export os='opensuse';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='wwwrun';
     export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
     export os='mageia-mandriva';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
     export apacheuser='apache';
     export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
     export os='ubuntu-debian';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apachelink="%{_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
+# Remove apache link
-export targetdir='/var/www/dolibarr'
+if [ -f $apachelink ] ;
-# Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents 
-export docdir='/usr/share/dolibarr/documents'
-
-if [ -f $conffile ] ;
 then
-    echo Delete apache config file for Dolibarr
+    echo Delete apache config link for Dolibarr
-    rm -f $conffile
+    rm -f $apachelink
     status=purge
 fi
 
+# Restart web servers if required
 if [ "x$status" = "xpurge" ] ;
 then
     # Restart web server
@@ -317,11 +345,19 @@ then
 fi
 
 # Removed dirs after apache restart
-echo Removed remaining dirs
+echo Removed remaining $apacheconfig
-rm -rf /etc/dolibarr
+rm -f $apacheconfig
-rm -rf $targetdir/htdocs/conf
+echo Removed remaining $config
-rm -rf $targetdir/htdocs/install
+rm -f $config
+echo Removed remaining $installconfig
+rm -f $installconfig
+echo Removed remaining $lockfile
+rm -f $lockfile
+echo Removed remaining dir $targetdir/doc
 rmdir $targetdir/doc >/dev/null 2>&1
-rmdir $targetdir/htdocs >/dev/null 2>&1
+#echo Removed remaining dir $targetdir/htdocs
+#rmdir $targetdir/htdocs >/dev/null 2>&1	# Already removed by rpm
 
 %changelog
+* Wed Jul 31 2011 Laurent Destailleur 3.1.0
+- Initial upstream (#723326)

build/rpm/file_contexts.dolibarr

@@ -0,0 +1,3 @@
+/etc/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
+/var/www/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
+/usr/share/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0

build/rpm/httpd-dolibarr.conf

@@ -65,6 +65,13 @@ Alias /dolibarr /var/www/dolibarr/htdocs
     Allow from all
 </DirectoryMatch>
 
+# Config files
+<DirectoryMatch /etc/dolibarr>
+	AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
 # Directory for data files
 <DirectoryMatch /usr/share/dolibarr/documents>
     AllowOverride All

build/rpm/install.forced.php.install

@@ -1,12 +1,13 @@
 <?php
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_type='mysqli';
+$force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarr';
+$force_install_database='dolibarrrpm';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrmysql';
+$force_install_databaselogin='dolibarrrpm';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';

dev/initdata/generate-commande.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
 	    \file       htdocs/dev/generate-commande.php
 		\brief      Script de generation de donnees aleatoires pour les commandes
-		\version    $Id: generate-commande.php,v 1.17 2011/07/09 14:11:40 eldy Exp $
+		\version    $Id: generate-commande.php,v 1.18 2011/07/31 22:21:57 eldy Exp $
 */
 
 // Test si mode batch

dev/initdata/generate-facture.php

@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -22,7 +21,7 @@
 /**
  *	    \file       htdocs/dev/generate-facture.php
  *		\brief      Script de generation de donnees aleatoires pour les factures
- *		\version    $Id: generate-facture.php,v 1.14 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-facture.php,v 1.15 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch

dev/initdata/generate-produit.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
  *      \file       htdocs/dev/generate-produit.php
  *		\brief      Script de generation de donnees aleatoires pour les produits
- *		\version    $Id: generate-produit.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-produit.php,v 1.17 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch

dev/initdata/generate-propale.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
  *	    \file       htdocs/dev/generate-propale.php
  *		\brief      Script de generation de donnees aleatoires pour les propales
- *		\version    $Id: generate-propale.php,v 1.15 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-propale.php,v 1.16 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch

dev/initdata/generate-societe.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
  *      \file       htdocs/dev/generate-societe.php
  *		\brief      Script de generation de donnees aleatoires pour les societes
- *		\version    $Id: generate-societe.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-societe.php,v 1.17 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch

dev/samples/create_invoice.php

@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       dev/samples/manage_order.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id: create_invoice.php,v 1.5 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: create_invoice.php,v 1.6 2011/07/31 22:21:59 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -36,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.5 $';
+$version='$Revision: 1.6 $';
 $error=0;
 
 

dev/samples/create_order.php

@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       dev/samples/manage_order.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id: create_order.php,v 1.9 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: create_order.php,v 1.10 2011/07/31 22:21:59 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -36,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.9 $';
+$version='$Revision: 1.10 $';
 $error=0;
 
 

dev/samples/create_product.php

@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       dev/samples/create_product.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id: create_product.php,v 1.8 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: create_product.php,v 1.9 2011/07/31 22:21:59 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -36,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.8 $';
+$version='$Revision: 1.9 $';
 $error=0;
 
 

dev/skeletons/build_class_from_table.php

@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-/* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       dev/skeletons/build_class_from_table.php
  *  \ingroup    core
  *  \brief      Create a complete class file from a table in database
- *  \version    $Id: build_class_from_table.php,v 1.32 2011/07/09 14:11:40 eldy Exp $
+ *  \version    $Id: build_class_from_table.php,v 1.33 2011/07/31 22:21:58 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -39,7 +38,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.
 
 // Main
-$version='$Revision: 1.32 $';
+$version='$Revision: 1.33 $';
 @set_time_limit(0);
 $error=0;
 

dev/skeletons/build_webservice_from_class.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       dev/skeletons/build_webservice_from_class.php
  *  \ingroup    core
  *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- *  \version    $Id: build_webservice_from_class.php,v 1.6 2011/07/09 14:11:40 eldy Exp $
+ *  \version    $Id: build_webservice_from_class.php,v 1.7 2011/07/31 22:21:58 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -39,7 +38,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.
 
 // Main
-$version='$Revision: 1.6 $';
+$version='$Revision: 1.7 $';
 @set_time_limit(0);
 $error=0;
 

dev/skeletons/modMyModule.class.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -28,7 +27,7 @@
  *      \file       htdocs/includes/modules/modMyModule.class.php
  *      \ingroup    mymodule
  *      \brief      Description and activation file for module MyModule
- *		\version	$Id$
+ *		\version	$Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 

dev/skeletons/skeleton_class.class.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       dev/skeletons/skeleton_class.class.php
  *      \ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *		\version    $Id$
+ *		\version    $Id: skeleton_class.class.php,v 1.32 2011/07/31 22:21:58 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */

dev/skeletons/skeleton_page.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       dev/skeletons/skeleton_page.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *		\brief      This file is an example of a php page
- *		\version    $Id$
+ *		\version    $Id: skeleton_page.php,v 1.19 2011/07/31 22:21:57 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -114,5 +113,5 @@ $somethingshown=$myobject->showLinkedObjectBlock();
 
 // End of page
 $db->close();
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:21:57 $ - $Revision: 1.19 $');
 ?>

dev/skeletons/skeleton_script.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       dev/skeletons/skeleton_script.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a command line script
- *      \version    $Id: skeleton_script.php,v 1.27 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: skeleton_script.php,v 1.28 2011/07/31 22:21:58 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -38,7 +37,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.27 $';
+$version='$Revision: 1.28 $';
 $error=0;
 
 

dev/translation/autotranslator.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       dev/translation/autotranslator.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a command line script
- *      \version    $Id: autotranslator.php,v 1.12 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: autotranslator.php,v 1.13 2011/07/31 22:21:59 eldy Exp $
  * 		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -45,7 +44,7 @@ require_once($path.'../../htdocs/lib/files.lib.php');
 $langs->load("main");
 
 // Global variables
-$version='$Revision: 1.12 $';
+$version='$Revision: 1.13 $';
 $error=0;
 
 

htdocs/accountancy/index.php

@@ -0,0 +1 @@
+Url not available

htdocs/adherents/card_subscriptions.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/adherents/card_subscriptions.php
  *       \ingroup    member
  *       \brief      Onglet d'ajout, edition, suppression des adhesions d'un adherent
- *       \version    $Id$
+ *       \version    $Id: card_subscriptions.php,v 1.79 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -996,5 +995,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.79 $');
 ?>

htdocs/adherents/cartes/index.php

@@ -0,0 +1 @@
+Url not available

htdocs/adherents/cotisations.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/adherents/cotisations.php
  *      \ingroup    member
  *		\brief      Page de consultation et insertion d'une cotisation
- *		\version    $Id$
+ *		\version    $Id: cotisations.php,v 1.58 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -229,5 +228,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.58 $');
 ?>

htdocs/adherents/document.php

@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/adherents/document.php
  *  \brief      Tab for documents linked to third party
  *  \ingroup    societe
- *  \version    $Id: document.php,v 1.8 2011/07/06 20:56:50 eldy Exp $
+ *  \version    $Id: document.php,v 1.9 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -231,6 +230,6 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.8 $');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.9 $');
 
 ?>

htdocs/adherents/fiche.php

@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.238 2011/07/31 22:23:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -1505,5 +1504,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
+llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.238 $');
 ?>

htdocs/adherents/fiche_subscription.php

@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/adherents/fiche_subscription.php
  *       \ingroup    member
  *       \brief      Page d'ajout, edition, suppression d'une fiche adh<EFBFBD>sion
- *       \version    $Id$
+ *       \version    $Id: fiche_subscription.php,v 1.30 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -393,5 +392,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.30 $');
 ?>

htdocs/adherents/htpasswd.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -23,7 +22,7 @@
  *      \ingroup    member
  *      \brief      Page d'export htpasswd du fichier des adherents
  *      \author     Rodolphe Quiedeville
- *      \version    $Id$
+ *      \version    $Id: htpasswd.php,v 1.15 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -82,5 +81,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.15 $');
 ?>

htdocs/adherents/index.php

@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -345,5 +344,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.72 $');
 ?>

htdocs/adherents/info.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/adherents/info.php
  *      \ingroup    member
  *		\brief      Page des informations d'un adherent
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.15 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -63,5 +62,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.15 $');
 ?>

htdocs/adherents/info_subscription.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/adherents/info.php
  *      \ingroup    member
  *		\brief      Page des informations d'un adherent
- *		\version    $Id$
+ *		\version    $Id: info_subscription.php,v 1.12 2011/07/31 22:23:28 eldy Exp $
 */
 
 require("../main.inc.php");
@@ -81,5 +80,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.12 $');
 ?>

htdocs/adherents/ldap.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/adherents/ldap.php
  *       \ingroup    ldap member
  *       \brief      Page fiche LDAP adherent
- *       \version    $Id$
+ *       \version    $Id: ldap.php,v 1.32 2011/07/31 22:23:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -233,5 +232,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.32 $');
 ?>

htdocs/adherents/liste.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/adherents/liste.php
  *      \ingroup    member
  *		\brief      Page to list all members of foundation
- *		\version    $Id$
+ *		\version    $Id: liste.php,v 1.84 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -347,5 +346,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.84 $');
 ?>

htdocs/adherents/note.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/adherents/note.php
  *      \ingroup    member
  *      \brief      Fiche de notes sur un adherent
- *		\version    $Id$
+ *		\version    $Id: note.php,v 1.29 2011/07/31 22:23:28 eldy Exp $
 */
 
 require("../main.inc.php");
@@ -179,5 +178,5 @@ if ($id)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.29 $');
 ?>

htdocs/adherents/type.php

@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/adherents/type.php
  *      \ingroup    member
  *		\brief      Page de configuration des types d'adherents
- *		\version    $Id: type.php,v 1.69 2011/06/26 21:03:44 eldy Exp $
+ *		\version    $Id: type.php,v 1.70 2011/07/31 22:23:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -637,5 +636,5 @@ if ($rowid > 0)
 
 $db->close();
 
-llxFooter('$Date: 2011/06/26 21:03:44 $ - $Revision: 1.69 $');
+llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.70 $');
 ?>

htdocs/admin/accounting.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/accounting.php
  *      \ingroup    accounting
  *      \brief      Page de configuration du module comptabilite expert
- *		\version    $Id$
+ *		\version    $Id: accounting.php,v 1.3 2011/07/31 22:23:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -169,6 +168,6 @@ if ($result)
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.3 $');
 
 ?>

htdocs/admin/agenda.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/agenda.php
  *      \ingroup    agenda
  *      \brief      Autocreate actions for agenda module setup page
- *      \version    $Id$
+ *      \version    $Id: agenda.php,v 1.23 2011/07/31 22:23:23 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -160,5 +159,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.23 $');
 ?>

htdocs/admin/agenda_extsites.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/agenda_extsites.php
  *      \ingroup    agenda
  *      \brief      Page to setup external calendars for agenda module
- *      \version    $Id$
+ *      \version    $Id: agenda_extsites.php,v 1.9 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -193,5 +192,5 @@ dol_htmloutput_mesg($mesg);
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.9 $');
 ?>

htdocs/admin/agenda_xcal.php

@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/agenda_xcal.php
  *      \ingroup    agenda
  *      \brief      Page to setup miscellaneous options of agenda module
- *		\version    $Id$
+ *		\version    $Id: agenda_xcal.php,v 1.23 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -150,5 +149,5 @@ print info_admin($message);
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.23 $');
 ?>

htdocs/admin/boxes.php

@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   \file       htdocs/admin/boxes.php
  *   \brief      Page to setup boxes
- *   \version    $Id$
+ *   \version    $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -471,5 +470,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
 ?>

htdocs/admin/clicktodial.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   \file       htdocs/admin/clicktodial.php
  *   \ingroup    clicktodial
  *   \brief      Page to setup module clicktodial
- *   \version    $Id$
+ *   \version    $Id: clicktodial.php,v 1.24 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -96,5 +95,5 @@ print '</table></form>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.24 $');
 ?>

htdocs/admin/commande.php

@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/commande.php
  *	\ingroup    commande
  *	\brief      Setup page of module Order
- *	\version    $Id$
+ *	\version    $Id: commande.php,v 1.75 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -522,5 +521,5 @@ print '</table>';
 
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.75 $');
 ?>

htdocs/admin/company.php

@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/company.php
  *	\ingroup    company
  *	\brief      Setup page to configure company/foundation
- *	\version    $Id: company.php,v 1.93 2011/07/18 18:09:04 eldy Exp $
+ *	\version    $Id: company.php,v 1.94 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -983,6 +982,6 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 18:09:04 $ - $Revision: 1.93 $');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.94 $');
 
 ?>

htdocs/admin/compta.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/compta.php
  *	\ingroup    compta
  *	\brief      Page to setup accountancy module
- *	\version    $Id$
+ *	\version    $Id: compta.php,v 1.33 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -187,5 +186,5 @@ if ($num)
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.33 $');
 ?>

htdocs/admin/confexped.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/confexped.php
  *		\ingroup    produit
  *		\brief      Page to setup sending module
- *		\version    $Id$
+ *		\version    $Id: confexped.php,v 1.22 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");

htdocs/admin/const.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/const.php
  *	\ingroup    setup
  *	\brief      Admin page to define miscellaneous constants
- *	\version    $Id$
+ *	\version    $Id: const.php,v 1.70 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -280,5 +279,5 @@ print "</form>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.70 $');
 ?>

htdocs/admin/contract.php

@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/contract.php
  *	\ingroup    contract
  *	\brief      Setup page of module Contracts
- *	\version    $Id$
+ *	\version    $Id: contract.php,v 1.5 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -174,5 +173,5 @@ if (is_resource($handle))
 print '</table><br>';
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.5 $');
 ?>

htdocs/admin/delais.php

@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       htdocs/admin/delais.php
  *		\brief      Page to setup late delays
- *		\version    $Id$
+ *		\version    $Id: delais.php,v 1.32 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -372,5 +371,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.32 $');
 ?>

htdocs/admin/dict.php

@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/dict.php
  *		\ingroup    setup
  *		\brief      Page to administer data tables
- *		\version    $Id: dict.php,v 1.145 2011/06/25 09:50:56 eldy Exp $
+ *		\version    $Id: dict.php,v 1.146 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -897,7 +896,7 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date: 2011/06/25 09:50:56 $ - $Revision: 1.145 $');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.146 $');
 
 
 /**

htdocs/admin/dons.php

@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/admin/dons.php
  *		\ingroup    dons
  *		\brief      Page d'administration/configuration du module Dons
- *		\version    $Id$
+ *		\version    $Id: dons.php,v 1.26 2011/07/31 22:23:21 eldy Exp $
  */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -276,5 +275,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.26 $');
 ?>

htdocs/admin/events.php

@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/events.php
  *      \ingroup    core
  *      \brief      Log event setup page
- *		\version    $Id: events.php,v 1.20 2011/07/18 23:30:56 eldy Exp $
+ *		\version    $Id: events.php,v 1.21 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -124,5 +123,5 @@ dol_htmloutput_mesg($mesg);
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 23:30:56 $ - $Revision: 1.20 $');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.21 $');
 ?>

htdocs/admin/expedition.php

@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/expedition.php
  *	\ingroup    expedition
  *	\brief      Page d'administration/configuration du module Expedition
- *	\version    $Id$
+ *	\version    $Id: expedition.php,v 1.70 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");

htdocs/admin/external_rss.php

@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/admin/external_rss.php
  *      \ingroup    external_rss
  *      \brief      Page d'administration/configuration du module ExternalRss
- *      \version    $Id$
+ *      \version    $Id: external_rss.php,v 1.48 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -317,5 +316,5 @@ print '</table>'."\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.48 $');
 ?>

htdocs/admin/facture.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/admin/facture.php
  *		\ingroup    facture
  *		\brief      Page to setup invoice module
- *		\version    $Id$
+ *		\version    $Id: facture.php,v 1.150 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -719,5 +718,5 @@ print "</table>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.150 $');
 ?>

htdocs/admin/fckeditor.php

@@ -13,17 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id$
+ * $Id: fckeditor.php,v 1.32 2011/07/31 22:23:24 eldy Exp $
  */
 
 /**
  *  \file       htdocs/admin/fckeditor.php
  *  \ingroup    fckeditor
  *  \brief      Page d'activation du module FCKeditor dans les autres modules
- *  \version    $Revision$
+ *  \version    $Revision: 1.32 $
  */
 
 require("../main.inc.php");
@@ -176,5 +175,5 @@ print $conf->global->FCKEDITOR_TEST;
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.32 $');
 ?>

htdocs/admin/fichinter.php

@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/fichinter.php
  *	\ingroup    fichinter
  *	\brief      Setup page of module Interventions
- *	\version    $Id$
+ *	\version    $Id: fichinter.php,v 1.62 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -453,5 +452,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.62 $');
 ?>

htdocs/admin/fournisseur.php

@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/admin/fournisseur.php
  *  \ingroup    fournisseur
  *  \brief      Page d'administration-configuration du module Fournisseur
- *  \version    $Id$
+ *  \version    $Id: fournisseur.php,v 1.63 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -618,5 +617,5 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.63 $');
 ?>

htdocs/admin/geoipmaxmind.php

@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/admin/geoipmaxmind.php
  *	\ingroup    geoipmaxmind
  *	\brief      Setup page for geoipmaxmind module
- *	\version    $Id$
+ *	\version    $Id: geoipmaxmind.php,v 1.3 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -128,5 +127,5 @@ if ($geoip)
 	$geoip->close();
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.3 $');
 ?>

htdocs/admin/ihm.php

@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/admin/ihm.php
  *       \brief      Page to setup GUI display options
- *       \version    $Id$
+ *       \version    $Id: ihm.php,v 1.130 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -527,5 +526,5 @@ else	// Show
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.130 $');
 ?>

htdocs/admin/index.php

@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       htdocs/admin/index.php
  *		\brief      Page d'accueil de l'espace administration/configuration
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.83 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -85,5 +84,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.83 $');
 ?>

htdocs/admin/ldap.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/admin/ldap.php
  *      \ingroup    ldap
  *      \brief      Page d'administration/configuration du module Ldap
- *      \version    $Id$
+ *      \version    $Id: ldap.php,v 1.84 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -320,5 +319,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.84 $');
 ?>

htdocs/admin/ldap_contacts.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  * 	\file       htdocs/admin/ldap_contacts.php
  *  \ingroup    ldap
  *  \brief      Page d'administration/configuration du module Ldap
- *  \version    $Id$
+ *  \version    $Id: ldap_contacts.php,v 1.38 2011/07/31 22:23:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -324,6 +323,6 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.38 $');
 
 ?>

htdocs/admin/ldap_groups.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *     	\file       htdocs/admin/ldap_groups.php
  *     	\ingroup    ldap
  *		\brief      Page to setup LDAP synchronization for groups
- *     	\version    $Id$
+ *     	\version    $Id: ldap_groups.php,v 1.34 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -249,5 +248,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.34 $');
 ?>

htdocs/admin/ldap_members.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       htdocs/admin/ldap_members.php
  *		\ingroup    ldap member
  *		\brief      Page d'administration/configuration du module Ldap adherent
- *		\version    $Id$
+ *		\version    $Id: ldap_members.php,v 1.35 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -432,5 +431,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.35 $');
 ?>

htdocs/admin/ldap_users.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       htdocs/admin/ldap_users.php
  *		\ingroup    ldap
  *		\brief      Page d'administration/configuration du module Ldap
- *		\version    $Id$
+ *		\version    $Id: ldap_users.php,v 1.37 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -341,5 +340,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.37 $');
 ?>

htdocs/admin/limits.php

@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/admin/limits.php
  *       \brief      Page de configuration des limites
- *       \version    $Id$
+ *       \version    $Id: limits.php,v 1.22 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -210,5 +209,5 @@ print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparr
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.22 $');
 ?>

htdocs/admin/livraison.php

@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/admin/livraison.php
  *      \ingroup    livraison
  *      \brief      Page d'administration/configuration du module Livraison
- *      \version    $Id$
+ *      \version    $Id: livraison.php,v 1.57 2011/07/31 22:23:21 eldy Exp $
  */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");

htdocs/admin/mailing.php

@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/mailing.php
  *		\ingroup    mailing
  *		\brief      Page to setup emailing module
- *		\version    $Id$
+ *		\version    $Id: mailing.php,v 1.14 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -96,6 +95,6 @@ print '</table></form>';
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.14 $');
 
 ?>