Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

ChangeLog

@@ -43,6 +43,7 @@ For users:
 - New: Chart are faster to build
 - New: Value of data into charts are visible on mouse hover.
 - New: Import wizard can import contacts.
+- New: Install process is now two times faster.
 - Fix: Can use POS module with several concurrent users.
 
 For developers:
@@ -53,6 +54,7 @@ For developers:
 - New: Log module outputs can be setup with "or" rule (not only "xor").
 - New: Add FirePHP output for logging module.
 - New: Add trigger ACTION_DELETE and ACTION_MODIFY.
+- New: Trigger now have a priority to define sort execution order.
 - New: Can define different requests according to database type into migration files.
 - New: Add "canvas" feature to overwrite page of thirdparty, contact, product with yours.
 - New: Removed artichow deprecated libraries.

README.md

@@ -24,6 +24,9 @@ Url depends on choice made on first step:
 	http://localhost/dolibarr/htdocs/install/
 or
 
+	http://localhost/dolibarr/install/
+or
+
 	http://yourdolibarrvirtualhost/install/
    
 - Follow instructions provided by installer...
@@ -45,7 +48,10 @@ This URL should looks like:
 	http://localhost/dolibarr/htdocs/install/
 or
 
-	http://yourdolibarrhost/install/index.php
+	http://localhost/dolibarr/install/
+or
+
+	http://yourdolibarrhost/install/
 
 Then choose the "update" option according to your case.
 Note: Migrate process can be ran safely several times.

build/debian/README.debian

-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/debian/README → build/debian/README.howto

@@ -18,7 +18,9 @@ with format .DEB (for Debian, Ubuntu, ...).
 # gpg --gen-key                          Generate a GPG key
 #
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
-# podebconf-report-po --from eldy@destailleur.fr	To send email to ask translations
+# podebconf-report-po --from email@email.com	To send email to ask translations
+# Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
+# msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX 
 #
 # lintian --pedantic -E -I package.deb   To test a package   
 #

build/debian/README.source

+==================================================================
+Dolibarr - Web based software to manage a small company or foundation
+==================================================================
+
+
+Note for package maintainers
+----------------------------
+This file explains how to modify official sources (from http://www.dolibarr.org)
+to have ready to use source files to build a debian package.
+
+All changes are included into patch file
+build/debian/install.patch

build/debian/changelog

@@ -6,4 +6,4 @@ dolibarr (3.2.0+nmu1) unstable; urgency=low
     
  -- Dolibarr team <contact@dolibarr.org>  Mon, 10 Aug 2011 12:00:00 +0100     
 
-# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
+# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz 
\ No newline at end of file

build/debian/control

@@ -4,7 +4,7 @@ Standards-Version: 3.9.2
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends: debhelper (>= 7), po-debconf, dpatch
 
 Package: dolibarr
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,

build/debian/copyright

@@ -5,24 +5,39 @@ Source: git@github.com:Dolibarr/dolibarr.git
 
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
-           2003-2011, Laurent Destailleur    <eldy@users.sourceforge.net>
-           2004-2011, Regis Houssin          <regis@dolibarr.fr>
-           2006-2011, Auguria SARL           <info@auguria.org>
-           2010-2011, Juanjo Menent          <jmenent@2byte.es>
            2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
+           2003-2012, Laurent Destailleur    <eldy@users.sourceforge.net>
            2003, Xavier Dutoit               <doli@sydesy.com>
+           2004-2012, Regis Houssin          <regis@dolibarr.fr>
            2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
            2004, Benoit Mortier              <benoit.mortier@opensides.be>
            2004, Christophe Combelles        <ccomb@free.fr>
+           2004, Guillaume Delecourt         <guillaume.delecourt@opensides.be>
            2004, Eric Seigne                 <eric.seigne@ryxeo.com>
+           2005, Brice Davoleau              <brice.davoleau@gmail.com>
+           2005, Kai Blankenhorn             <kaib@bitfolge.de>
+           2005-2006, Marc Barilley/Ocebo    <marc@ocebo.com>
+           2005, Matthieu Valleton           <mv@seeschloss.org>
            2005, Patrick Rouillon            <patrick@rouillon.net>
-           2005, Marc Barilley / Ocebo       <marc@ocebo.com>
+           2005, Simon TOSSER                <simon@kornog-computing.com>
            2006, Andre Cianfarani            <acianfa@free.fr>
+           2006-2011, Auguria SARL           <info@auguria.org>
            2006, Jean Heimburger             <jean@tiaris.info>
+           2006, Roman Ozana                 <ozana@omdesign.cz>
+           2006, Yannick Warnier             <ywarnier@beeznest.org>
            2007, Patrick Raguin              <patrick.raguin@gmail.com>
+           2007, Franky Van Liedekerke       <franky.van.liedekerker@telenet.be>
            2007-2008, Jeremie Ollivier       <jeremie.o@laposte.net>
+           2008, Matteli                     <unknown@unknown.com>
            2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+           2010, Francois Legastelois        <flegastelois@teclib.com>
+           2010-2012, Juanjo Menent          <jmenent@2byte.es>
+           2010-2012, Philippe Grand         <philippe.grand@atoo-net.com>
+           2010, Pierre Morin                <pierre.morin@auguria.net>
            2010, Servitux Servicios Informaticos <info@servitux.es>
+           2011, Herve Prot                  <herve.prot@symeos.com>
+           2011, Remy Younes                 <ryounes@gmail.com>
+           2012, Christophe Battarel         <christophe.battarel@altairis.fr>
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -36,43 +51,13 @@ License: GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  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/*
-Copyright: Artichow team
-License: Public Domain
- This work is not subject to copyright in any jurisdiction
-
-Files: htdocs/includes/ckeditor/*
-Copyright: CKeditor team
-License: GPL-2+
- 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 the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- 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/fpdi/*
 Copyright: FPDFI team
@@ -89,15 +74,14 @@ License: GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  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/jquery/*
 Copyright: JQuery team
 License: MIT or GPL-2+
@@ -113,10 +97,8 @@ License: MIT or GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -140,11 +122,13 @@ License: MIT or GPL-2+
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
+
 Files: htdocs/includes/jquery/plugins/flot/*
 Copyright: Flot team
 License: Public Domain
  This work is not subject to copyright in any jurisdiction
 
+
 Files: htdocs/includes/jsgantt/*
 Copyright: JSGantt team
 License: GPL-2+
@@ -160,20 +144,20 @@ License: GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  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/phpexcel/*
 Copyright: PHPExcel team
 License: LGPL 2.1
  See http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html
 
+
 Files: htdocs/includes/odtphp/*
 Copyright: 2008, Julien Pauli
            2008, Cyril PIERRE de GEYER 
@@ -191,17 +175,15 @@ License: GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  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/tcpdf/*
 Copyright: TCPDF team
 License: LGPL 3.0
   See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html
- 
\ No newline at end of file

build/debian/dolibarr.doc-base

+Document: dolibarr
+Title: Dolibarr ERP & CRM documentation
+Author: Dolibarr team
+Abstract: This documentation covers the install, use and administration of
+ Dolibarr ERP & CRM software. 
+Section: Office
+
+Format: HTML
+Index: /usr/share/doc/dolibarr/index.html
+Files: /usr/share/doc/dolibarr/*.html
\ No newline at end of file

build/debian/dolibarr.install

+debian/dolibarr.desktop usr/share/applications
+debian/dolibarr.xpm usr/share/pixmaps
+ChangeLog usr/share/doc/dolibarr
+README usr/share/doc/dolibarr
+doc/install usr/share/doc/dolibarr
+doc/user usr/share/doc/dolibarr
+doc/index.html usr/share/doc/dolibarr
+build/debian/apache.conf etc/dolibarr
+build/debian/lighttpd.conf etc/dolibarr
+build usr/share/dolibarr
+dev usr/share/dolibarr
+htdocs usr/share/dolibarr
+scripts usr/share/dolibarr

build/debian/install

-etc/dolibarr/apache.conf
-etc/dolibarr/lighttpd.conf
-usr/share/applications/dolibarr.desktop
-usr/share/dolibarr
-usr/share/doc/dolibarr
-usr/share/pixmaps

build/debian/patches/00list

+install.dpatch
\ No newline at end of file

build/debian/patches/install.dpatch

+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install.patch by <eldy@users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Updates htdocs/filefunc.inc.php
+## DP: Updates htdocs/install/inc.php
+## DP: Updates htdocs/support/inc.php
+
+@DPATCH@
+
+
+--- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
++++ new/htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
+@@ -64,8 +64,8 @@
+ $conffile = "conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ // Include configuration
+--- old/htdocs/install/inc.php	2011-09-03 02:33:26.450952000 +0200
++++ new/htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
+@@ -84,8 +84,8 @@
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ if (! defined('DONOTLOADCONF') && file_exists($conffile))
+--- old/htdocs/support/inc.php	2011-09-03 02:34:39.606952000 +0200
++++ new/htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -79,8 +79,8 @@
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ $charset="UTF-8";	// If not output format found in any conf file
+ if (! defined('DONOTLOADCONF') && file_exists($conffile))

build/debian/po/POTFILES.in

-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] dolibarr.templates
\ No newline at end of file