Fix: BUG#33584

Fix: Removed not translated licence file.
Fix: Missing some customers
2011-06-17 18:21:02 +00:00 · 2011-06-15 10:05:15 +00:00 · 2011-06-15 08:55:19 +00:00 · 2011-06-07 10:45:43 +00:00 · 2011-06-06 13:02:19 +00:00 · 2011-05-28 03:50:07 +00:00
3723 changed files with 172753 additions and 508746 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,5 +9,3 @@ index.php
 document
 documents
 DEBIAN
-install.lock
-*.patch
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +0,0 @@
-htdocs/conf/conf.php
-htdocs/conf/conf.php.old
-documents/
-custom/
-custom2/
-nbproject
-.settings/
-.buildpath
-default.properties
-/.git
-/.project
--- a/.project
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dolibarr</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+#Sun Oct 03 22:45:56 CEST 2010
+eclipse.preferences.version=1
+encoding//build/exe/doliwamp/Languages=ISO-8859-1
+encoding//htdocs/langs/fr_FR/other.lang=UTF-8
+encoding/<project>=UTF-8
--- a/.settings/org.eclipse.core.runtime.prefs
+++ b/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,3 @@
+#Fri May 08 23:29:39 CEST 2009
+eclipse.preferences.version=1
+line.separator=\n
--- a/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Jul 17 02:14:29 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
--- a/.settings/org.eclipse.php.core.prefs
+++ b/.settings/org.eclipse.php.core.prefs
@@ -0,0 +1,3 @@
+#Wed Dec 01 20:46:32 CET 2010
+eclipse.preferences.version=1
+include_path=
--- a/.settings/org.eclipse.php.core.projectOptions.prefs
+++ b/.settings/org.eclipse.php.core.projectOptions.prefs
@@ -0,0 +1,5 @@
+#Wed Aug 13 10:35:38 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.php.core.contextRoot=
+org.eclipse.php.core.defaultEncoding=
+org.eclipse.php.core.includePath=<?xml version\="1.0" encoding\="UTF-8"?>\n<includepath>\n</includepath>\n
--- a/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs
+++ b/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs
@@ -0,0 +1,8 @@
+#Wed Oct 20 18:46:50 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.php.debug.core.use-project-settings=true
+org.eclipse.php.debug.coredefaultPHP=PHP Linux 5.3.2
+org.eclipse.php.debug.coreoutput_encoding=UTF-8
+org.eclipse.php.debug.corephp_debugger_id=org.eclipse.php.debug.core.xdebugDebugger
+org.eclipse.php.debug.corestop_at_first_line_string=true
+org.eclipse.php.debug.coretransfer_encoding=UTF-8
--- a/.settings/org.eclipse.stp.policy.wtp.editor.prefs
+++ b/.settings/org.eclipse.stp.policy.wtp.editor.prefs
@@ -0,0 +1,4 @@
+#Fri May 28 19:41:14 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.stp.policy.wtp.editor.overrides.global=false
+org.eclipse.stp.policy.wtp.editor.schema.path=schemas
--- a/.settings/org.eclipse.wst.html.core.prefs
+++ b/.settings/org.eclipse.wst.html.core.prefs
@@ -0,0 +1,36 @@
+#Thu Jun 24 20:11:26 CEST 2010
+attrDuplicate=2
+attrInvalidName=2
+attrInvalidValue=2
+attrNameMismatch=2
+attrUndefName=2
+attrUndefValue=2
+attrValueMismatch=1
+attrValueUnclosed=2
+cdataInvalidContent=2
+cdataUnclosed=1
+commentInvalidContent=2
+commentUnclosed=1
+docDoctypeUnclosed=1
+docDuplicateTag=1
+docInvalidChar=2
+docInvalidContent=2
+eclipse.preferences.version=1
+elemCoexistence=2
+elemDuplicate=2
+elemEndInvalidCase=1
+elemInvalidContent=2
+elemInvalidDirective=1
+elemInvalidEmptyTag=2
+elemInvalidName=1
+elemMissingEnd=2
+elemMissingStart=1
+elemStartInvalidCase=2
+elemUnclosedEndTag=1
+elemUnclosedStartTag=1
+elemUnknownName=2
+elemUnnecessaryEnd=2
+piInvalidContent=2
+piUnclosed=1
+piUndefined=2
+refInvalidContent=2
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
--- a/.settings/org.eclipse.wst.validation.prefs
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,13 @@
+#Wed Jan 12 15:17:27 CET 2011
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.104.v200911120201
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.php.core.org.eclipse.php.core.PHPTaskValidator/global=TF01
+vals/org.eclipse.php.ui.HTMLValidatorForPHP/groups=0107include01111contentType130org.eclipse.php.core.phpsourceT0107exclude11504file111menu.js.phpF0104file114htdocs/custom2F0204file124htdocs/includes/efc_xfssF0204file125htdocs/includes/adodbtimeF0204file124htdocs/includes/artichowF0204file124htdocs/includes/ckeditorF0204file125htdocs/includes/fckeditorF0204file120htdocs/includes/fpdfF0204file125htdocs/includes/magpierssF0204file122htdocs/includes/nusoapF0204file122htdocs/includes/odtphpF0204file131htdocs/includes/php_excelreaderF0204file130htdocs/includes/php_writeexcelF0204file122htdocs/includes/smartyF0204file121htdocs/includes/tcpdfF02
+vals/org.eclipse.wst.html.ui.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude11004file114htdocs/custom2F0204file08dev/specF0204file134htdocs/cashdesk/include/jscalendarF0204file124htdocs/includes/ckeditorF0204file122htdocs/includes/jqueryF0204file123htdocs/includes/jsganttF0204file125htdocs/includes/fckeditorF0204file121htdocs/includes/tcpdfF0204file120htdocs/includes/fpdfF0204file121htdocs/includes/jcropF02
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file125htdocs/includes/fckeditorF0204file123htdocs/includes/jsganttF0204file09build/padF0204file117dev/phpcheckstyleF02
+vf.version=3
--- a/.settings/org.eclipse.wst.ws.service.policy.prefs
+++ b/.settings/org.eclipse.wst.ws.service.policy.prefs
@@ -0,0 +1,3 @@
+#Fri May 28 19:41:14 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false
--- a/.settings/org.eclipse.wst.xsl.core.prefs
+++ b/.settings/org.eclipse.wst.xsl.core.prefs
@@ -0,0 +1,13 @@
+#Tue Dec 22 11:07:44 CET 2009
+CHECK_CALL_TEMPLATES=2
+CHECK_XPATHS=2
+CIRCULAR_REF=2
+DUPLICATE_PARAMETER=2
+EMPTY_PARAM=1
+MISSING_INCLUDE=2
+MISSING_PARAM=1
+NAME_ATTRIBUTE_EMPTY=2
+NAME_ATTRIBUTE_MISSING=2
+TEMPLATE_CONFLICT=2
+eclipse.preferences.version=1
+use-project-settings=true
--- a/.settings/org.sonar.ide.eclipse.prefs
+++ b/.settings/org.sonar.ide.eclipse.prefs
@@ -0,0 +1,5 @@
+#Thu Jun 03 22:22:09 CEST 2010
+eclipse.preferences.version=1
+projectArtifactId=dolibarr
+projectGroupId=
+sonarServerUrl=http\://localhost\:9450
--- a/595
+++ b/595
@@ -1,25 +1,22 @@
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

- Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.

  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -30,347 +27,195 @@ in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.

-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.

-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.

-  Also, for each distributor's protection, we want to make certain
+  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.

  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".

-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
+Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.

-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.

-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:

-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
+    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.

+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
 These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
+identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
+on the Program, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
+entire whole, and thus to each and every part regardless of who wrote it.

 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
-collective works based on the Library.
+collective works based on the Program.

-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.

-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,

-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,

-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)

-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.

-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
+distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+the Program or works based on it.

-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.

-  11. If, as a consequence of a court judgment or allegation of patent
+  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
+refrain entirely from distribution of the Program.

-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.

 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
+integrity of the free software distribution system, which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
@@ -380,102 +225,116 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
+
+  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.

-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.

-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.

-                            NO WARRANTY
+			    NO WARRANTY

-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.

-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.

-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs

-           How to Apply These Terms to Your New Libraries
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.

-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.

-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
+    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library 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 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 library is distributed in the hope that it will be useful,
+    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
-    Library General Public License for more details.
+    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 program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

 Also add information on how to contact you by electronic and paper mail.

+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
 You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
+school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.

-  <signature of Ty Coon>, 1 April 1990
+  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

-That's all there is to it!
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- a/35
+++ b/35
@@ -13,34 +13,27 @@ Composant         Version  License                     Compatible GPL   Usage
 In alphabetical order of includes directory:
 AdoDb-Date        0.21     Modified BSD License        Yes              Date convertion
 ArtiChow          1.07     Public Domain               Yes              Graphics
-CKEditor		  3.6.1	   GPL or LGPL 2.1 or MPL 1.1  Yes				Editor WYSIWYG
+CKEditor		  3.4.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
+FCKEditor         2.6.4    LGPL 2.1 or Mozilla PL 1.0  Yes              Editor WYSIWYG
 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
 FPDI_Protection   1.0.3    Apache Software License 2.0 No GPL3 only     PDF encryption (8 files)
 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)
-jQuery jNotify	  1.1.00   Apache Software License 2.0 No GPL3 only		JS library plugin jNotify (to use ajax popups)
-jQuery Mobile	  1.0b1	   GPL and MIT Licence		   Yes			    JS library for smartphone (not used)
-jQuery Tiptip     1.3      GPL and MIT Licence         Yes              JS library for tooltips
-JSGantt           1.2      BSD Licence                 Yes              JS library (to build Gantt reports)
+JCrop			  0.9.8	   MIT Licence				   Yes				JS library to crop images
+JQuery            1.4.4    GPL and MIT Licence         Yes              JS library,Layout,TableDND
+JQuery UI         1.8.7    GPL and MIT Licence         Yes              JS library+Plugin UI
+JQuery Mobile	  1.0a2	   GPL and MIT Licence		   Yes			    JS library for smartphone
 MagPieRss         0.72     GPL 2.0                     Yes              Load RSS
 NuSoap            0.9.5    LGPL 2.1                    Yes              Interfaces with third tools
 OdtPHP            1.0.1    GPL 2.0                     Yes              Library to build/edit ODT files
 Php-barcode       0.3pl1   GPL 2.0                     Yes              Bar code generation
-PHP_WriteExcel    0.3.0    LGPL 2.1                    Yes              Excel files generation (obsolete)
-PHP_ExcelReader   2.21     MIT License                 Yes              Parse and retrieve information from XLS files (obsolete)
-PHPExcel		  1.7.6    LGPL 2.1                    Yes              Read/Write XLS files, read ODS files
+PHP_WriteExcel    0.3.0    LGPL 2.1                    Yes              Excel files generation
+PHP_ExcelReader   2.21     MIT License                 Yes              Parse and retrieve information from XLS files
 Smarty            2.6.26   LGPL 2.1                    Yes              Templates engine used by some pages
 SMTPs             1.15     GPL                         Yes              SMTPS library
-TCPDF             5.9.098  LGPL 3.0                    Yes				PDF generation
+TCPDF             5.8.023  LGPL 3.0                    Yes
 VCard             2.0      GPL 2.0                     Yes              VCard library

 For licenses compatibility informations:
@@ -50,23 +43,17 @@ http://www.fsf.org/licensing/licenses/index_html
 Copyright
 ---------

-Copyright (C) 2011
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent
- Philippe Grand
-
 Copyright (C) 2010
 - Laurent Destailleur <eldy@users.sourceforge.net>
 - Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent
+- simnandez
 - r2gnl
 - meos

 Copyright (C) 2009
 - Laurent Destailleur <eldy@users.sourceforge.net>
 - Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent
+- simnandez

 Copyright (C) 2008
 - Laurent Destailleur <eldy@users.sourceforge.net>
--- a/129
+++ b/129
@@ -1,135 +1,8 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
+$Id$
 --------------------------------------------------------------

-
-***** ChangeLog for 3.1.1 compared to 3.1.0 *****
-
- New: Add option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS. With this option added, 
-       credit notes are not removed from total amount of invoice but are just 
-       payments used to reducs remain to pay.
- New: Added hidden option MAIN_FIX_FOR_BUGGED_MTA to fix bugged MTA.       
- Fix: Removed warnings during install.
- Fix: State into address of paypal payments were lost.
- Fix: Currency into paypal payments were always euros.
- Fix: Removed Bare LF from emails sent with smtps method.
- Fix: Can show report on selected period.
- Fix: product removed from list after deleted into order.
- Fix: [bug #270] PostgreSQL backend try to connect throught TCP socket for 
- Fix: price was not without tax when using multiprice into POS module.
- Fix: Can delete bank account.
- Fix: [ bug #277 ] Year dropdown in table header of supplier invoices.
- Fix: Some other very minor fixes.
-
-
-
-***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
-WARNING: Credit notes are no more used as a "payment" but are removed from total
-         amount of final invoice. So final turnover is now amount of credit note
-         + amount of final invoice (previously turnover was final invoices only).
-
-For users:
- New: War against number of clicks:
-     - When adding a free bank transaction, form to add next one is still
-       visible (save one click).
-     - task #10969 : Add checkbox to close automatically invoice if
-       payment is complete (save 3 clicks).
-     - Reduce a step into supplier order workflow to save time. If user
-       has permission to approve, order is approved when order is validated.
-       (Save 2 clicks).
-     - In commercial main menu, left menu are already opened. This save one click
-       to open a proposal or order.
-     - Can add a discount for third party, during invoice edition (and we 
-       saved clicks again).
-     - When creating a contract, sales representative are preset to user. This save
-       4 clicks.
-     - Can edit several fields in bank transaction line page into one update.
-     - Creation of contacts from third party page go back to third party.
-     - Preselect model if there is only one. This save 2 clicks. 
-     - Can remove a project if project has tasks. No need to delete task one by one.
- New: Enhance donation module. Add a status "canceled".
- New: Add filters on all statistics report pages.
- New: If a service contains subproducts, subpoducts are decrease when service
-       is decrease.
- New: Add status for third parties to disable a third party.
- New: Can send interventions cards by email.
- New: Increase list of available notifications into module Notifications.
- New: Add option MAIN_FIRST_TO_UPPER to force upper case of first 
-       letters for names and firstname.
- New: Can filter of payment type in bank transaction list.
- New: Status of users is visible into user list.
- New: Support BSB code for bank account in Australia.
- New: Can set date of payment for autocreate invoice/payment when 
-       creating a foundation subscription.
- New: Can edit note of payment.
- New: Option to make login not mandatory in member module.
- New: Add box for last members for foundation module.
- New: A specialized menu can now be used when using smartphones.
- New: Can add information on current user on ODT generation.
- New: Prefix on third party is not used by default. Hidden option
-       SOCIETE_USEPREFIX can restore old feature.
- New: Standing orders module use bank account from banks module.
- New: Ask password when creating a user from a contact.
- New: task #10577: Use a numbering module for shipment and contract.
- New: Can create manually order from proposal.
- New: Add a first workflow module to create automatic action on some
-       events (create order on proposal closing).
- New: Use autocompletion on invoice select when creating replacement 
-       or credit note invoice.
- New: task #10885: Add a week view for calendar.
- New: task #11018: Add a status "not applicable" on events.
- New: Add subscriptions/country/region/town statistics for member module.
- New: Can define a proxy for external web access.
- New: task #11003: checkbox on checks for deposit.
- New: Add status into export. Add third party default language into export.
- New: Can filter on date and bank account when building check receipts.
- New: task #10958 : Add link to cheque receipts into bank transaction 
-       line if exists
- New: Can import external ical url into dolibarr agenda view.
- New: Can add a logo on third parties card.
- New: task #11194 : Can delete uploaded photos 
- New: task #9744 : Add the barcode to select products on Point of Sale module
- New: Subscription/Unsubscription to mailman mailing-list can be done on 
-       validate/resiliate in foundation module.
- New: Can use extrafields on third parties.
- New: Add chart to report counts by status on element home area pages.
- New: Look: Usage of Jquery Notify to show result or error messages on action.
- 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.
- Fix: Debug and clean withdraw module.
- Fix: Allow access permission for point of sale module.
- Fix: Permissions issues with suppliers.
- Fix: Admin dict data is showing with active language 
-
-For developers:
- New: External modules can add tabs on agenda views.
- New: External modules can also remove default tabs.
- New: External modules can force skin directory so force their own skins.
- New: External modules can add their own menu manager.
- New: External modules can force menu manager.
- New: External modules can overwrite all default language files by
-       forcing priority on langs directories on its own lang directory.
- New: External modules can show export list with an "enabled" condition.
- New: Support a backtopage parameter on contact creation page.
- New: Add id on div to show logo.
- New: Install wizard can activate a module at end of install.
- New: Dictionnary setup works with very large external dictionnaries (Add 
-       page navigation).
- New: Add api to draw graphics with javascript (using Jquery Flot).
- New: Can add user login into menu urls added by modules.
-
-For translators:
- New: Add fa_IR language.
- Fix: Move language ar_AR to ar_SA, sv_SV to sv_SE and da_Da to da_DK.
-
-
-
 ***** ChangeLog for 3.0 compared to 2.9 *****

 For users:
--- a/26
+++ b/26
@@ -13,14 +13,11 @@ Starter documentation
 I - DOLIBARR INSTALL
 --------------------

-If you have no technical knowledge, and you are looking for an autoinstaller
-to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the 
-all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package 
-of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of 
-Dolibarr for Fedora, Redhat, Mandriva, Opensue, Mageia).
-
-You can download this at:
-https://sourceforge.net/projects/dolibarr/files/
+If you have no technical knowledge, use Windows and you are looking for an
+autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download 
+DoliWamp (the all-in-one package of Dolibarr for Windows). 
+You can download it at:
+http://www.dolibarr.org/downloads/cat_view/62-stable-versions

 If you already have installed a Web server and a Mysql database, you can
 install this version like this:
@@ -56,13 +53,20 @@ To upgrade Dolibarr from an old version to this one:
  
 - If you came from a beta version or from any version x.y.z to any
  other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser (this should be done automatically at first dolibarr
-  access).
-  This URL should looks like:
+  page in your browser.
+  Url might be for example:
   http://localhost/dolibarr/htdocs/install/
  or
   http://yourdolibarrhost/install/index.php

+  To know what is exactly correct URL for "install/" page, take URL you use
+  to go on login page. It it ends with "index.php", remove it. Then add
+  "install/" at the end.
+  For example, if your login page is: 
+  http://yourdolibarrhost/something/index.php
+  Then, your "install/" pages will be 
+  http://yourdolibarrhost/something/install/
+  
  Then choose the "update" option according to your case.
  Note: Migrate process can be ran safely several times.
  
--- a/25
+++ b/25
@@ -13,14 +13,11 @@ Documentation démarrage rapide
 I - INSTALLER DOLIBARR
 ----------------------

-Si vous n'avez pas de connaissances techniques, et que vous recherchez
-un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
-vous devez vous réorienter vers DoliWamp (la version tout-en-un
-de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
-Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
-OpenSuse, Mandriva ou Mageia).
-Vous pouvez les télécharger à l'adresse: 
-http://www.dolibarr.org/downloads/
+Si vous n'avez pas de connaissances techniques, que vous êtes sous Windows et
+que vous recherchez un programme d'installation qui install Dolibarr ERP/CRM en 
+quelques clics, vous devez vous réorienter vers DoliWamp (la version tout-en-un
+de Dolibarr pour Windows). Vous pouvez la télécharger à l'adresse: 
+http://www.dolibarr.fr/telechargements/cat_view/62-versions-stables

 Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
 vous pouvez installer Dolibarr avec cette version de la manière suivante:
@@ -56,13 +53,19 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
  il n'y a pas besoin de migration de données.
  
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page "install/" de migration dans votre 
-  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
-  Ce sera une URL du genre:
+  ou y varient, vous devez appelez la page de migration dans votre navigateur:
   http://localhost/dolibarr/htdocs/install/index.php
  ou
   http://yourdolibarrhost/install/index.php

+  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
+  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
+  Dans tous les cas, ajouter ensuite "install/" à la fin.
+  Par exemple, si votre page de connexion est: 
+  http://yourdolibarrhost/something/index.php
+  Alors la page "install/" sera 
+  http://yourdolibarrhost/something/install/
+
  Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
  Note: Le processus de migration peut etre lance plusieurs fois sans risque.
  
--- a/README.md
+++ b/README.md
@@ -1,116 +0,0 @@
-# DOLIBARR ERP/CRM
-
-Dolibarr ERP/CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.
-
-
-## INSTALL
-
-If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensue, Mandriva or Mageia).
-
-You can download this at: [Official Website] (http://www.dolibarr.org/downloads/)
-
-If you already have installed a Web server and a Mysql database, you can install this version like this:
-
- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator).
-  
- Create an empty file "htdocs/conf/conf.php" and set permissions for your web server user (write permissions will be removed once install is finished).
-  
- From your browser, call the dolibarr "install/" page.
-
-Url depends on choice made on first step:
-
-	http://localhost/dolibarr/htdocs/install/
-or
-
-	http://yourdolibarrvirtualhost/install/
-   
- Follow instructions provided by installer...
-
-
-
-## UPGRADE
-
-To upgrade Dolibarr from an old version to this one:
-
- Overwrite all old files inside old 'dolibarr' directory by files provided into new version package.
-  
- If you came from version x.y.z to x.y.w (only third number differ), there is no need to run any migrate process.
-  
- If you came from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" page in your browser (this should be done automatically at first dolibarr access).
-
-This URL should looks like:
-
-	http://localhost/dolibarr/htdocs/install/
-or
-
-	http://yourdolibarrhost/install/index.php
-
-Then choose the "update" option according to your case.
-Note: Migrate process can be ran safely several times.
-  
-
-
-## WHAT'S NEW
-
-See ChangeLog file.
-
-
-
-## 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").
-
-
-
-## 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).
--- a/build.xml
+++ b/build.xml
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="dolibarr" default="hudson" basedir=".">
-
-<!-- Exclude/ignore paths -->
- <property name="ignorepaths" value="${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/efc_xfss,${basedir}/htdocs/includes/fckeditor,${basedir}/htdocs/includes/fpdf,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/magpierss,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/php_writeexcel,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/smarty,${basedir}/htdocs/includes/smtps,${basedir}/htdocs/includes/tcpdf,${basedir}/htdocs/includes/vcard" />
-
- <target name="clean">
-  <!-- Clean up -->
-  <delete dir="${basedir}/hudson"/>
-  <delete dir="${basedir}/generatedJUnitFiles"/>
-
-  <!-- Create build directories -->
-  <mkdir dir="${basedir}/hudson/doxygen"/>
-  <mkdir dir="${basedir}/hudson/logs"/>
-  <mkdir dir="${basedir}/hudson/coverage"/>
- </target>
-
- <!-- Run phpmd, phpcpd, phpcs, doxygen and phploc in parallel -->
- <target name="parallelTasks">
-  <parallel>
-   <!-- <antcall target="phpmd"/> -->
-   <antcall target="phpcpd"/>
-   <antcall target="phpcs"/>
-   <antcall target="doxygen"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
-
- <!-- Generate pmd.xml -->
-<!--
-<target name="phpmd">
-  <exec executable="phpmd">
-   <arg line="htdocs xml codesize,unusedcode
-              -\-reportfile '${basedir}/hudson/logs/pmd.xml'
-              -\-ignore=${ignorepaths}
-              " />
-  </exec>
- </target>
-->
-
- <!-- Generate pmd-cpd.xml -->
- <target name="phpcpd">
-  <exec executable="phpcpd">
-   <arg line="--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
-              --exclude '${basedir}/htdocs/includes/adodbtime'
-              --exclude '${basedir}/htdocs/includes/artichow'
-              --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
-              --exclude '${basedir}/htdocs/includes/ckeditor'
-              --exclude '${basedir}/htdocs/includes/efc_xfss'
-              --exclude '${basedir}/htdocs/includes/fckeditor'
-              --exclude '${basedir}/htdocs/includes/fpdf'
-              --exclude '${basedir}/htdocs/includes/geoip'
-              --exclude '${basedir}/htdocs/includes/jquery'
-              --exclude '${basedir}/htdocs/includes/jsgantt'
-              --exclude '${basedir}/htdocs/includes/magpierss'
-              --exclude '${basedir}/htdocs/includes/nusoap'
-              --exclude '${basedir}/htdocs/includes/odtphp'
-              --exclude '${basedir}/htdocs/includes/php_writeexcel'
-              --exclude '${basedir}/htdocs/includes/phpexcel'
-              --exclude '${basedir}/htdocs/includes/smarty'
-              --exclude '${basedir}/htdocs/includes/smtps'
-              --exclude '${basedir}/htdocs/includes/tcpdf'
-              --exclude '${basedir}/htdocs/includes/vcard'
-              htdocs
-              " />
-  </exec>
- </target>
- 
- <!-- Generate phploc.csv -->
- <target name="phploc">
-  <exec executable="phploc">
-   <arg line="--log-csv '${basedir}/hudson/logs/phploc.csv'
-              --exclude '${basedir}/htdocs/includes/adodbtime'
-              --exclude '${basedir}/htdocs/includes/artichow'
-              --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
-              --exclude '${basedir}/htdocs/includes/ckeditor'
-              --exclude '${basedir}/htdocs/includes/efc_xfss'
-              --exclude '${basedir}/htdocs/includes/fckeditor'
-              --exclude '${basedir}/htdocs/includes/fpdf'
-              --exclude '${basedir}/htdocs/includes/geoip'
-              --exclude '${basedir}/htdocs/includes/jquery'
-              --exclude '${basedir}/htdocs/includes/jsgantt'
-              --exclude '${basedir}/htdocs/includes/magpierss'
-              --exclude '${basedir}/htdocs/includes/nusoap'
-              --exclude '${basedir}/htdocs/includes/odtphp'
-              --exclude '${basedir}/htdocs/includes/php_writeexcel'
-              --exclude '${basedir}/htdocs/includes/phpexcel'
-              --exclude '${basedir}/htdocs/includes/smarty'
-              --exclude '${basedir}/htdocs/includes/smtps'
-              --exclude '${basedir}/htdocs/includes/tcpdf'
-              --exclude '${basedir}/htdocs/includes/vcard'
-              htdocs
-              " />
-  </exec>
- </target>
-   
- <!-- Generate checkstyle.xml -->
- <target name="phpcs">
-  <exec executable="phpcs" dir="${basedir}" output="${basedir}/hudson/logs/checkstyle.xml">
-    <arg line=" --standard=${basedir}/test/codesniffer/ruleset.xml
-    			--report=checkstyle
-                --ignore=${ignorepaths}
-                htdocs
-                "/>
-  </exec>
- </target>
-
- <!-- Generate Doxygen documentation -->
- <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}" failonerror="false">
-   <arg value="${basedir}/build/doxygen/hudson-doxygen.doxyfile"/>
-  </exec>
- </target>
- 
- <!-- Run unit tests and generate junit.xml and clover.xml -->
- <target name="phpunit">
-  <exec executable="phpunit" dir="${basedir}" failonerror="true">
-   <arg line="	--log-junit ${basedir}/hudson/logs/junit.xml
-				--coverage-clover ${basedir}/hudson/coverage/clover.xml
-  				--coverage-html ${basedir}/hudson/coverage/
-  				test/phpunit/AllTests.php
-  				"/>
-  </exec>
- </target>
-
- <target name="hudson" depends="clean,parallelTasks,phpunit"/>
-</project>
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -13,7 +13,3 @@ module_pibarcode-1.0.tgz
 version-phpsane.txt
 makepack-phpsane.conf
 html
-*.deb
-*.dsc
-*.tar.gz
-*.changes
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,9 +0,0 @@
-/dolibarr_*.deb
-/dolibarr_*.dsc
-/dolibarr_*.changes
-/dolibarr_*.gz
-/dolibarr-*.tgz
-/dolibarr-*.rpm
-/dolibarr-*.zip
-/dolibarr-*.tgz
-/*.exe
--- a/build/aps/APP-META-1.1.xml
+++ b/build/aps/APP-META-1.1.xml
@@ -1,123 +0,0 @@
-<!-- Application namespaces and APS version (step 9) -->
-<application xmlns="http://apstandard.com/ns/1" version="1.1">
-	<!-- Application common properties (step 9) -->
-	<name>Dolibarr ERP-CRM</name>
-	<version>__VERSION__</version>
-	<release>__RELEASE__</release>
-	<homepage>http://www.dolibarr.org/</homepage>
-	<vendor>
-		<name>Dolibarr</name>
-		<homepage>http://www.dolibarr.org/</homepage>
-		<icon path="images/appicon_64.png" />
-	</vendor>
-	<packager>
-		<name>Laurent Destailleur</name>
-		<homepage>http://www.nltechno.com</homepage>
-		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
-	</packager>
-	<presentation>
-		<summary>Dolibarr ERP-CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
-		<description>
-Dolibarr is a free modular software (you see only
-features you need) to manage small and medium companies, freelancers
-or foundations.
-This OpenSource software is designed to provide all features you need to
-manage information on many aspects of your business
-into an intuitive and user-friendly graphical interface
-It's an OpenSource software you can install on a web server or as a
-standalone software. Dolibarr is designed to provide simplicity to end-user.
-        </description>
-		<icon path="images/appicon_64.png" />
-		<screenshot path="images/dolibarr_screenshot1_640x480.png">
-			<description>Screenshot 1</description>
-		</screenshot>
-		<changelog>
-			<version version="3.1.0" release="0">
-				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
-			</version>
-		</changelog>
-		<categories>
-			<category>Back office/Billing</category>
-			<category>Back office/Accounting and Financial</category>
-			<category>Back office/Customer Relationship Management</category>
-			<category>Back office/Enterprise Resource Planning</category>
-		</categories>
-		<languages>
-			<language>en</language>
-			<language>fr</language>
-			<language>es</language>
-			<language>de</language>
-			<language>pt</language>
-		</languages>
-	</presentation>
-	<upgrade match="/application/version = '3.0'" />
-	<!-- Application service (step 4) -->
-	<service id="dolibarr">
-		<!-- Service presentation properties (step 7) -->
-		<license must-accept="false">
-			<text>
-				<name>GPLv2</name>
-				<file>COPYING</file>
-			</text>
-		</license>
-		<presentation>
-			<name>Dolibarr instance</name>
-            <summary>Dolibarr services</summary>
-			<entry-points>
-				<entry class="frontpage" dst="/">
-					<label>Application entry point</label>
-				</entry>
-			</entry-points>
-		</presentation>
-		<!-- Service settings (step 7) -->
-		<settings>
-		      <!-- 
-			<group>
-				<name>Administrator's preferences</name>
-				<setting id="admin_name" type="string" default-value="admin"
-					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
-					<name>Administrator's login</name>
-					<error-message>
-Please make sure the text you entered starts with a	letter and continues with either numbers, letters, underscores or hyphens.
-                    </error-message>
-				</setting>
-				<setting id="admin_password" type="password" min-length="1">
-					<name>Password</name>
-				</setting>
-			</group>
-			-->
-		</settings>
-		<!-- Service used technologies (step 6) -->
-		<requirements xmlns:php="http://apstandard.com/ns/1/php"
-			xmlns:db="http://apstandard.com/ns/1/db">
-			<php:version min="4.2.0" />
-			<php:extension>mysql</php:extension>
-			<php:extension>mbstring</php:extension>
-			<php:safe-mode>false</php:safe-mode>
-			<db:db>
-				<db:id>main</db:id>
-				<db:default-name>dolibarr</db:default-name>
-				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
-				<db:server-type>mysql</db:server-type>
-				<db:server-min-version>4.1.0</db:server-min-version>
-			</db:db>
-		</requirements>
-		<!-- Content delivery settings (step 8) -->
-		<provision>
-			<url-mapping>
-				<default-prefix>dolibarr</default-prefix>
-				<installed-size>35000000</installed-size>
-				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
-					<php:handler>
-						<php:extension>php</php:extension>
-					</php:handler>
-				</mapping>
-			</url-mapping>
-			<!-- Service configuration script declaration (step 10) -->
-            <configuration-script name="configure.php">
-                <configuration-script-language>php</configuration-script-language>
-                <status-control/>
-			</configuration-script>
-		</provision>
-	</service>
-</application>
--- a/build/aps/APP-META-1.2.xml
+++ b/build/aps/APP-META-1.2.xml
@@ -1,120 +0,0 @@
-<!-- Application namespaces and APS version (step 9) -->
-<application xmlns="http://apstandard.com/ns/1" version="1.2">
-	<!-- Application common properties (step 9) -->
-	<id>dolibarr</id>
-	<name>Dolibarr</name>
-	<version>__VERSION__</version>
-	<release>__RELEASE__</release>
-	<homepage>http://www.dolibarr.org/</homepage>
-	<vendor>
-		<name>Dolibarr</name>
-		<homepage>http://www.dolibarr.org/</homepage>
-		<icon path="images/appicon_64.png" />
-	</vendor>
-	<packager>
-        <name>Laurent Destailleur</name>
-        <homepage>http://www.nltechno.com</homepage>
-		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
-	</packager>
-	<presentation>
-		<summary>Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
-		<description>
-Dolibarr is a free modular software (you see only
-features you need) to manage small and medium companies, freelancers
-or foundations.
-This OpenSource software is designed to provide all features you need to
-manage information on many aspects of your business
-into an intuitive and user-friendly graphical interface
-It's an OpenSource software you can install on a web server or as a
-standalone software. Dolibarr is designed to provide simplicity to end-user.
-</description>
-		<icon path="images/appicon_64.png" />
-		<screenshot path="images/dolibarr_screenshot1_640x480.jpg">
-			<description>Screenshot 1</description>
-		</screenshot>
-		<changelog>
-			<version version="3.1.0" release="0">
-				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
-			</version>
-		</changelog>
-		<categories>
-			<category>Back office/Billing</category>
-			<category>Back office/Accounting and Financial</category>
-			<category>Back office/Customer Relationship Management</category>
-			<category>Back office/Enterprise Resource Planning</category>
-		</categories>
-		<languages>
-			<language>en</language>
-			<language>fr</language>
-			<language>es</language>
-			<language>de</language>
-			<language>pt</language>
-		</languages>
-	</presentation>
-	<upgrade match="/application/version = '3.0'" />
-	<!-- Application service (step 4) -->
-	<service id="dolibarr">
-		<!-- Service presentation properties (step 7) -->
-		<license must-accept="false">
-			<text xml:lang="">
-				<name>GPLv2</name>
-				<file>COPYING</file>
-			</text>
-		</license>
-		<presentation>
-			<name>Dolibarr instance</name>
-			<entry-points>
-				<entry class="frontpage" dst="/">
-					<label>Application entry point</label>
-				</entry>
-			</entry-points>
-		</presentation>
-		<!-- Service settings (step 7) -->
-		<settings>
-			<group>
-				<name>Administrator's preferences</name>
-				<setting id="admin_name" type="string" default-value="admin"
-					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
-					<name>Administrator's login</name>
-					<error-message>
-Please make sure the text you entered starts with a letter and continues with either numbers, letters, underscores or hyphens.
-                    </error-message>
-				</setting>
-				<setting id="admin_password" type="password" min-length="1">
-					<name>Password</name>
-				</setting>
-			</group>
-		</settings>
-		<!-- Service used technologies (step 6) -->
-		<requirements xmlns:php="http://apstandard.com/ns/1/php"
-			xmlns:db="http://apstandard.com/ns/1/db">
-			<php:version min="4.2.0" />
-			<php:extension>mysql</php:extension>
-			<php:extension>mbstring</php:extension>
-			<php:safe-mode>false</php:safe-mode>
-			<db:db>
-				<db:id>main</db:id>
-				<db:default-name>dolibarr</db:default-name>
-				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
-				<db:server-type>mysql</db:server-type>
-				<db:server-min-version>4.1.0</db:server-min-version>
-			</db:db>
-		</requirements>
-		<!-- Content delivery settings (step 8) -->
-		<provision>
-			<url-mapping>
-				<default-prefix>dolibarr</default-prefix>
-				<installed-size>35000000</installed-size>
-				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
-					<php:handler>
-						<php:extension>php</php:extension>
-					</php:handler>
-				</mapping>
-			</url-mapping>
-			<!-- Service configuration script declaration (step 10) -->
-			<configuration-script name="configure">
-				<script-language>php</script-language>
-			</configuration-script>
-		</provision>
-	</service>
-</application>
--- a/build/aps/README
+++ b/build/aps/README
@@ -1,20 +0,0 @@
-README (English)
-##################################################
-This directory is dedicated to APS package building
-##################################################
-
-Docs for APS format 1.1:
-http://www.apsstandard.org/r/doc/aps-format-1.1-packaging-guide/index.htm
-
-Docs for APS format 1.2 (need APP-LIST.xml):
-http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/index.htm
-
-
-To check an APS package on Debian:
-* Install libgdiplus with 
-apt-get install libgdiplus
-* Install apslint.exe
-tar -xvf xxxx.tgz 
-* Go into directory of apslint and run command
-mono ./apslint.exe '/media/DATA/Mes Developpements/dolibarr/build/dolibarr-3.1.0-dev.app.zip' 
-
--- a/build/aps/configure.php
+++ b/build/aps/configure.php
@@ -1,152 +0,0 @@
-#!/usr/bin/php
-<?php
-/*-----------------------------------------------------
- *
- *----------------------------------------------------- */
-
-// This is list of predefined variables when script is ran
-// We have to set them manually to run script outside context.
-/*putenv('SETTINGS_admin_name=admin');
-putenv('SETTINGS_admin_password=admin-ad');
-putenv('BASE_URL_SCHEME=http');
-putenv('BASE_URL_HOST=localhost');
-putenv('BASE_URL_PORT=0');
-putenv('BASE_URL_PATH=/');
-//putenv('WEB___DIR=/var/wwww/dolibarr/htdocs');      // WEB___DIR is dir to htdocs
-putenv('WEB___DIR=../htdocs');      // WEB___DIR is dir to htdocs
-putenv('DB_main_NAME=dolibarr');
-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)
-{
-    print "Usage: configure.php (install | upgrade <version> | configure | remove)\n";
-    exit(1);
-}
-$command = $_SERVER['argv'][1]; //$command stores the argument with which the script was invoked.
-
-
-if($command == "install")
-{
-    $db_id = 'main';
-
-    $rootdir = getenv("WEB___DIR");
-    if ($rootdir != '/') $rootdir = preg_replace('/\/$/','',$rootdir);  // Remove last /
-    $datadir = $rootdir.'/dolibarr_documents';
-
-    //List of database-related variables that are passed to the configuration
-    //script. See the 6.3.1.1.1. Environment variables section of the
-    //Specification for details.
-    $db_address = getenv("DB_${db_id}_HOST");
-    $db_port = getenv("DB_${db_id}_PORT");
-    $dblogin = getenv("DB_${db_id}_LOGIN");
-    $dbpassword = getenv("DB_${db_id}_PASSWORD");
-    $dbname = getenv("DB_${db_id}_NAME");
-
-
-    //PHP functions for connecting to the mysql server and
-    //executing SQL queries.
-    //mysql_connect($dbaddress, $dblogin, $dbpassword);
-    //mysql_select_db($dbname);
-    /*
-     $sql_queries = file($query_file);
-     foreach ($sql_queries as $query) mysql_query($query);
-     */
-
-
-    //Other code to be executed on invoking configure with
-    //the install argument.
-
-    // Create empty config file
-    $file=$rootdir.'/conf/conf.php';
-    print "Create conf file ".$file."\n";
-    $fp = fopen($file, 'wb');
-    if ($fp)
-    {
-        fclose($fp);
-        chmod($file,0775);
-    }
-    else
-    {
-        print "configure.php install: Unable to write file $file.\n";
-        exit(1);
-    }
-
-    // Create empty directory that will be used by software to store uploaded documents
-    print "Create directory ".$datadir."\n";
-    @mkdir($datadir);
-    chmod($datadir,0775);
-
-    // Create install.forced.php into htdocs/install directory with value.
-    // This will set parameters of install for web installer wizard.
-    $file_source=$rootdir.'/../build/aps/install.forced.php.install';
-    $file=$rootdir.'/install/install.forced.php';
-    print "Create file ".$file.' from '.$file_source."\n";
-
-    $modify_hash=array(
-    'WEB___DIR'=>$rootdir,
-    'DB_'.$db_id.'_HOST'=>$db_address,
-    'DB_'.$db_id.'_PORT'=>$db_port,
-    'DB_'.$db_id.'_LOGIN'=>$dblogin,
-    'DB_'.$db_id.'_PASSWORD'=>$dbpassword,
-    'DB_'.$db_id.'_NAME'=>$dbname
-    );
-
-    $file_content = fread(fopen($file_source, 'r'), filesize($file_source));
-    foreach($modify_hash as $param => $val){
-        $file_content = str_replace($param, php_quote($val), $file_content);
-    }
-    $fp = fopen($file, 'wb');
-    if ($fp)
-    {
-        fputs($fp, $file_content);
-        fputs($fp, "\n");
-        fclose($fp);
-        chmod($file,0775);
-    }
-    else
-    {
-        print "configure.php install: Unable to write file $file.\n";
-        exit(2);
-    }
-
-    exit(0);
-}
-
-if($command == "remove")
-{
-    //Code to be executed on invoking configure with the remove argument
-    exit(0);
-}
-
-if($command == "upgrade")
-{
-    //Code to be executed on invoking configure with the upgrade argument
-    exit(0);
-}
-
-if($command == "configure")
-{
-    //Code to be executed on invoking configure with the configure argument
-    exit(0);
-}
-
-print "configure.php: Error: unknown command $command.\n";
-exit(1);
-
-
-
-// Content of file-util.php we need
-
-function php_quote($val)
-{
-    $res_val = str_replace("\\", "\\\\", $val);
-    $res_val = str_replace("'", "\\'", $res_val);
-    return $res_val;
-}
-
-?>
--- a/build/aps/install.forced.php.install
+++ b/build/aps/install.forced.php.install
@@ -1,25 +0,0 @@
-<?php
-// File to force Dolibarr wizard installer choices.
-//
-// This file must be present into htdocs/install directory
-// during install process to be used.
-//
-// $Id: install.forced.php.install,v 1.2 2011/06/26 11:41:50 eldy Exp $
-//
-$force_install_noedit=1;
-$force_install_message='KeepDefaultValuesDeb';
-$force_install_main_data_root='WEB___DIR/dolibarr_documents';
-$force_install_type='mysqli';
-$force_install_dbserver='DB_main_HOST';
-$force_install_port='DB_main_PORT';
-$force_install_database='DB_main_NAME';
-$force_install_createdatabase='0';
-$force_install_databaselogin='DB_main_LOGIN';
-$force_install_databasepass='DB_main_PASSWORD';
-$force_install_createuser='0';
-$force_install_databaserootlogin='';
-$force_install_databaserootpass='';
-$force_install_dolibarrlogin='admin';
-$force_install_nophpinfo='1';
-$force_install_lockinstall='444';
-?>
--- a/build/deb/README
+++ b/build/deb/README
@@ -6,49 +6,3 @@ DEB Package tools
 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:
-#
-# 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 binary only package
-# dpkg -c package.deb                    List content of package
-# dpkg -I package.deb                    Give informations on package
-# dpkg -i package.deb                    Install a package
-# dpkg-reconfigure -plow package		 Reconfigure package
-# dpkg -L packagename                    List content of installed package 
-# dpkg -r packagename                    Remove config files and interactive saved answers
-# 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:
-
- Post an ITP with reportbugs :
-> reportbug -B debian --email username@domain.tld wnpp
-See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
-
- Wait until you received bug number.
-For first ITP submission of Dolibarr, bug id was 634783.
-
- Check bug is into database by searching with id on http://www.debian.org/Bugs/
- 
- 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
--- a/build/deb/README.debian
+++ b/build/deb/README.debian
@@ -1,103 +0,0 @@
-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).
--- a/build/deb/apache-cominclude.sh
+++ b/build/deb/apache-cominclude.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# File:		apache-cominclude.sh
+# Changes:
+#	20010219 Ola Lundqvist <opal@debian.org>
+#	20011022 Luca De Vitis <luca@debian.org>
+#		Introduced the error variable.
+#	        o /[[:space:]][[:space:]]*/[[:space:]]\+/
+#		Changed from "cat $conffile | sed" to "sed ... < $conffile"
+#	20020116 Ola Lundqvist <opal@debian.org>
+#		Documented the error variable.
+# Needs:	$conffile - The file that should be modified.
+#		$includefile - The file that should be commented out.
+# Description:	Comments out a include statement.
+# Sets:		$status = {error, nothing, comment}
+#		$error = error message (if $status = error).
+
+status=error
+
+if [ -z "$conffile" ] ; then
+    error="No config file specified in apache-cominclude.sh"
+elif [ -z "$includefile" ] ; then
+    error="No include file specified in apache-cominclude.sh"
+elif [ ! -f $conffile ] ; then
+    error="File $conffile not found!"
+elif [ ! -f $includefile ] ; then
+    error="File $includefile not found!"
+else
+    status=nothing
+    if grep -e "^[[:space:]]*Include[[:space:]]\+$includefile\b" $conffile > /dev/null 2>&1; then
+	log="${log}Commenting import for $includefile in $conffile."
+	status=comment
+	sed -e "s#^\( *\)\(Include *$includefile\b\)#\1\#\2#" < $conffile > $conffile.new
+	mv $conffile.new $conffile
+    fi
+fi
--- a/build/deb/apache-include.sh
+++ b/build/deb/apache-include.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# File:		apache-include.sh
+# Changes:
+#      	20010219 Ola Lundqvist <opal@debian.org>
+#	20011022 Luca De Vitis <luca@debian.org>
+#		Introduced the error variable.
+#	        o /[[:space:]][[:space:]]*/[[:space:]]\+/
+#	20020116 Ola Lundqvist <opal@debian.org>
+#		Documented the error variable.
+# Needs:	$conffile - where the config file is.
+#		$includefile - what file that should not be included.
+#		/usr/share/wwwconfig-common/apache-uncominclude.sh
+# Description:	Includes a file in a apache config file.
+#		If it is not included (and commented) it will be added
+#		at the bottom of the file.
+# Sets:		$status = {error, nothing, include, uncomment}
+#		$error = error message (if $status = error).
+
+status=error
+if [ -z "$conffile" ] ; then
+    error="No config file specified in apache-include.sh"
+elif [ -z "$includefile" ] ; then
+    error="No include file specified in apache-include.sh"
+elif [ ! -f $conffile ] ; then
+    error="File $conffile not found!"
+elif [ ! -f $includefile ] ; then
+    error="File $includefile not found!"
+else
+    status=nothing
+    . /usr/share/dolibarr/build/deb/apache-uncominclude.sh
+    if [ "$status" = "nothing" ] ; then
+	if ! grep -e "Include[[:space:]]\+$includefile\b" $conffile > /dev/null 2>&1; then
+	    status=include
+	    log="${log}Including $includefile in $conffile."
+	    echo "Include $includefile" >> $conffile
+	fi
+    fi
+fi
--- a/build/deb/apache-include_all.sh
+++ b/build/deb/apache-include_all.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+# File:		apache-include_all.sh
+# Changes:
+#      	20010219 Ola Lundqvist <opal@debian.org>
+#	20011022 Luca De Vitis <luca@debian.org>
+#		Introduced the error variable.
+#	        o /[[:space:]][[:space:]]*/[[:space:]]\+/
+#	        Reduced the 3 assignment in the function to a single sed
+#		script.
+#	20020116 Ola Lundqvist <opal@debian.org>
+#		Documented the error variable.
+#	20020412 Ola Lundqvist <opal@debian.org>
+#		Added check for if the server is installed.
+# Needs:	$server - what apache server that should be configured.
+#			That can be any matching /etc/$server/*.conf
+#		$includefile - what file that should not be included.
+#		/usr/share/wwwconfig-common/apache-uncominclude.sh
+#		/usr/share/wwwconfig-common/apache-include.sh
+# Description:	Includes a file in a apache config file.
+#		If it is not included (and commented) it will be added
+#		at the bottom of the file.
+#		It first checks for if any in the server
+# Sets:		$status = {error, nothing, uncomment, include}
+#		$error = error message (if $status = error).
+
+status=error
+
+if [ -z "$includefile" ] ; then
+    error="No include file specified for apache-include_all.sh."
+elif [ ! -f $includefile ] ; then
+    error="Includefile $includefile not found in apache-include_all.sh."
+elif [ ! -d /etc/$server ] ; then
+    error="No server $server installed, unable to configure it."
+else
+    status=nothing
+    if grep -e "Include[[:space:]]\+$includefile" /etc/$server/*.conf > /dev/null 2>&1; then
+	lstatus=nothing
+	log="${log}Include of $includefile found in apache config files."
+	for conffile in /etc/$server/*.conf; do
+	    . /usr/share/dolibarr/build/deb/apache-uncominclude.sh
+	    if [ "$status" = "uncomment" ] ; then
+		lstatus=$status
+	    fi
+	done
+	status=$lstatus
+    else
+	conffile=/etc/$server/httpd.conf
+	. /usr/share/dolibarr/build/deb/apache-include.sh
+	status=include
+    fi
+fi
--- a/build/deb/apache-uncominclude.sh
+++ b/build/deb/apache-uncominclude.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# File:		apache-uncominclude.sh
+# Changes:	
+#      	20010219 Ola Lundqvist <opal@debian.org>
+#	20011022 Luca De Vitis <luca@debian.org>
+#		Introduced the error variable.
+#	        o /[[:space:]][[:space:]]*/[[:space:]]\+/
+#	        Changed from "cat $conffile | sed" to "sed ... < $conffile"
+#	20020116 Ola Lundqvist <opal@debian.org>
+#		Documented the error variable.
+# Needs:	$conffile - The file that should be modified.
+#		$includefile - The file that should not be included.
+# Description:	Comments out a include statement.
+# Sets:		$status = {error, nothing, uncomment}
+#		$error = error message (if $status = error).
+
+status=error
+
+if [ -z "$conffile" ] ; then
+    error="No config file specified in apache-uncominclude.sh"
+elif [ -z "$includefile" ] ; then
+    error="No include file specified in apache-uncominclude.sh"
+elif [ ! -f $conffile ] ; then
+    error="File $conffile not found!"
+elif [ ! -f $includefile ] ; then
+    error="File $includefile not found!"
+else
+    status=nothing
+    if grep -e "^[[:space:]]*#[[:space:]]*Include[[:space:]]\+$includefile\b" $conffile > /dev/null 2>&1; then
+	log="${log}Uncommenting import for $includefile in $conffile"
+	status=uncomment
+	sed -e "s|^\([[:space:]]*\)#\([[:space:]]*Include[[:space:]][[:space:]]*$includefile\b\)|\1\2|g;" < $conffile > $conffile.new
+	mv $conffile.new $conffile
+    fi
+fi
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -1,23 +1,6 @@
-# Apache config file for Dolibarr
-
-<IfModule mod_alias.c>
 Alias /dolibarr /usr/share/dolibarr/htdocs
-</IfModule>

-# You can also use dolibarr as a VirtualHost
-# <VirtualHost *:*>
-#     ServerName mydolibarrhostname.com
-#     ServerAdmin root@example.com
-#     DocumentRoot /usr/share/dolibarr/
-#     ErrorLog logs/ldap.example.com-error.log
-#     CustomLog logs/ldap.example.com-access.log common
-# </VirtualHost>
-
-# Directory for web pages
-<DirectoryMatch /usr/share/dolibarr>
-  Order deny,allow
-  Allow from all
-  DirectoryIndex index.php
+<DirectoryMatch /usr/share/dolibarr/htdocs>
  Options +FollowSymLinks +Indexes

  ErrorDocument 401 /public/error-401.php
@@ -28,57 +11,9 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
    php_flag register_globals Off
  </IfModule>

-  <IfModule mod_php5.c>
-    php_flag magic_quotes_gpc Off
-    php_flag register_globals Off
-  </IfModule>
-
-
-    # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
-    # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
-    #AddType text/javascript .jgz
-    #AddEncoding gzip .jgz
-    
-    # OPTIMIZE: To use gzip compression (on the fly).
-    # Note that you must also enable the module mod_deflate.
-    # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
-    #TODO
-    
-    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
-    # Note that you must also enable the module mod_expires.
-    #ExpiresActive On
-    #ExpiresByType image/x-icon A2592000
-    #ExpiresByType image/gif A2592000
-    #ExpiresByType image/png A2592000
-    #ExpiresByType image/jpeg A2592000
-    #ExpiresByType text/css A2592000
-    #ExpiresByType text/javascript A2592000
-    #ExpiresByType application/x-javascript A2592000
-    #ExpiresByType application/javascript A2592000
-
 </DirectoryMatch>

-# Directory for public pages
-<DirectoryMatch /usr/share/dolibarr/htdocs/public>
-    AllowOverride All
-    Order deny,allow
-    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
-    Order deny,allow
-    Allow from all
-</DirectoryMatch>
-<DirectoryMatch /var/lib/dolibarr/documents>
+<DirectoryMatch /usr/share/dolibarr/htdocs/public/>
    AllowOverride All
    Order deny,allow
    Allow from all
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -1,9 +0,0 @@
-dolibarr (3.1.1-1.1) unstable; urgency=low
-
-  * Non-maintainer upload
-  * New upstream release.
-    closes: bug#634783
-    
- -- Dolibarr team <contact@dolibarr.org>  Mon, 20 Feb 2012 12:00:00 +0100     
-
-# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
--- a/build/deb/compat
+++ b/build/deb/compat
@@ -1 +0,0 @@
-7
--- a/build/deb/conf.php.install
+++ b/build/deb/conf.php.install
@@ -1,232 +0,0 @@
-<?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';
-
-?>
--- a/build/deb/config
+++ b/build/deb/config
@@ -1,6 +1,15 @@
 #!/bin/sh
 # Debian install package run: config, preinst, prerm, postinst, postrm
 #
+# dpkg -l list all packages
+# dpkg -b is to build package
+# dpkg -c package.deb list content of package
+# dpkg -I package.deb give informations on package
+# dpkg -i package.deb install a package
+#
+# dpkg -L packagename list content of installed package 
+# dpkg --purge remove interactive saved answers
+#

 set -e

@@ -13,29 +22,16 @@ db_version 2.0
 echo Run the dolibarr config script

 # Rotate old configuration
-#if [ "$1" = "reconfigure" ] ; then
-#	config="/etc/dolibarr/apache.conf"
-#	if [ -f $config ] ; then
-#		for i in $(seq 8 -1 0) ; do
-#			if [ -f ${config}.$i ] ; then
-#				mv ${config}.$i ${config}.$(($i +1))
-#			fi
-#		done
-#		mv ${config} ${config}.0
-#	fi
-#fi
-# Rotate old configuration
-#if [ "$1" = "reconfigure" ] ; then
-#	config="/etc/dolibarr/lighttpd.conf"
-#	if [ -f $config ] ; then
-#		for i in $(seq 8 -1 0) ; do
-#			if [ -f ${config}.$i ] ; then
-#				mv ${config}.$i ${config}.$(($i +1))
-#			fi
-#		done
-#		mv ${config} ${config}.0
-#	fi
-#fi
+if [ "$1" = "reconfigure" ] ; then
+	config="/etc/dolibarr/apache.conf"
+	for i in $(seq 8 -1 0) ; do
+		if [ -f ${config}.$i ] ; then
+			mv ${config}.$i ${config}.$(($i +1))
+		fi
+	done
+	mv ${config} ${config}.0
+fi
+


 db_capb backup
@@ -43,9 +39,8 @@ db_capb backup
 db_title "dolibarr" || true


-# Ask if we must delete database
-echo "Ask for web server to setup"
-db_input critical dolibarr/reconfigure-webserver || true
+# Ask for web server type.
+#db_input critical "dolibarr/webserver" || true

 if db_go ; then
    okcancel="1"
--- a/build/deb/control
+++ b/build/deb/control
@@ -0,0 +1,42 @@
+Package: dolibarr
+Version: __VERSION__
+Architecture: all
+Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Essential: no
+Installed-Size: 31200
+Depends: apache2, libapache2-mod-php5, php5, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl
+Section: web
+Priority: optional
+Recommends: mozilla | netscape
+Homepage: http://www.dolibarr.org
+Description: Dolibarr ERP & CRM
+ Dolibarr ERP/CRM is an open source/free software for
+ small and medium companies, foundations or freelances. It includes
+ different features for Enterprise Resource Planning (ERP) and Customer
+ Relationship Management (CRM) but also other features for different
+ activities.
+ .
+ Dolibarr features are activated by modules. Most common modules are
+ * Products and services catalog
+ * Stock management
+ * Bank accounts management
+ * Customers, Suppliers or Prospects directory
+ * Contacts directory
+ * Orders management
+ * Commercial proposals management
+ * Invoices management
+ * Point of Sale
+ * Payments management
+ * Commercial actions management
+ * Contracts management
+ * Standing orders management
+ * Shipping management
+ * Foundations members management
+ * Donations management
+ * Bookmarks management
+ * Mass Emailings
+ * Reports
+ * Data export and import tools
+ * LDAP connectivity
+ * PDF exports
+ * And a lot of other modules
--- a/build/deb/control.debian
+++ b/build/deb/control.debian
@@ -1,55 +0,0 @@
-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 (>= 7), po-debconf
-
-Package: dolibarr
-Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-mysql | php5-mysqli, 
-    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
-    xdg-utils,
-    mysql-server,
-    ${misc:Depends}
-Recommends: apache2 | lighttpd | httpd, mysql-client
-Suggests: www-browser
-Architecture: all
-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.
--- a/build/deb/control.debianbin
+++ b/build/deb/control.debianbin
@@ -1,46 +0,0 @@
-Package: dolibarr
-Version: __VERSION__
-Architecture: all
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Installed-Size: 61200
-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
-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.
--- a/build/deb/copyright
+++ b/build/deb/copyright
@@ -1,83 +0,0 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Upstream-Name: Dolibarr
-Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: cvs.savannah.nongnu.org:/sources/dolibar
-
-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, 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, 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
- 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'.
- Full text of Lesser General Public Licence version 3 can be 
- found in the file
- `/usr/share/common-licenses/LGPL-3'.
- 
-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/jquery/plugins/flot/*
-License: Public Domain
-
-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
- 
--- a/build/deb/docs
+++ b/build/deb/docs
@@ -0,0 +1 @@
+doc/*
--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -2,24 +2,16 @@
 # This file is used to add Ubuntu menu entry
 # It must be saved into directory /usr/share/applications
 Version=1.0
-Name=Dolibarr ERP & CRM
-Name[es]=Dolibarr ERP & CRM
-Name[fr]=Dolibarr ERP & CRM
-Name[it]=Dolibarr ERP & CRM
-GenericName=Dolibarr ERP & CRM
-Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
-Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
-Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
-# Command to open an URL
-# For Fedora: xdg-open 
-# For Debian/Ubuntu: xdg-open or x-www-browser
-# (exo-open for xfde, gnome-open for gnome, ...)
+Encoding=UTF-8
+Name=Dolibarr ERP/CRM
+GenericName=Dolibarr ERP/CRM
+Comment=The easy to use manager for small and medium enterprises or foundations
+# xdg-open use default bowser to open url (exo-open for xfde, gnome-open for gnome, ...)
 Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office
+Category=Application;Office;
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
--- a/build/deb/dolibarr.lintian-overrides
+++ b/build/deb/dolibarr.lintian-overrides
@@ -1,18 +0,0 @@
-# embedded libraries, which don't seem to be available in Debian in correct version
-# or because they were modified and are specific dolibarr code
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/adapters/jquery.js
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckeditor.js
-embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/extlib/Snoopy.class.inc
-embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/rss_parse.inc
-embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php
-embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
-# embedded fonts, wich are specific to Dolibarr usage
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/Tuffy.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBold.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBoldItalic.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyItalic.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/Aerial.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBd.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBdIt.ttf
-font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialIt.ttf
--- a/build/deb/examples
+++ b/build/deb/examples
@@ -0,0 +1 @@
+usr/share/dolibarr/htdocs/conf/conf.php.example
--- a/build/deb/files
+++ b/build/deb/files
@@ -0,0 +1,2 @@
+etc
+usr
--- a/build/deb/format
+++ b/build/deb/format
@@ -1 +0,0 @@
-1.0
--- a/build/deb/install
+++ b/build/deb/install
@@ -1,6 +0,0 @@
-etc/dolibarr/apache.conf
-etc/dolibarr/lighttpd.conf
-usr/share/applications/dolibarr.desktop
-usr/share/dolibarr
-usr/share/doc/dolibarr
-usr/share/pixmaps
--- a/build/deb/install.forced.php.install
+++ b/build/deb/install.forced.php.install
@@ -1,22 +1,11 @@
 <?php
-// File to force Dolibarr wizard installer choices.
-//
-// This file must be present into htdocs/install directory
-// during install process to be used.
-//
-// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
-//
-
-$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
-#$force_install_main_data_root='/usr/share/dolibarr/documents';
-$force_install_main_data_root='/var/lib/dolibarr/documents';
+$force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_type='mysqli';
-$force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarrdebian';
+$force_install_database='dolibarr';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrdebian';
+$force_install_databaselogin='dolibarrmysql';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
--- a/build/deb/lighttpd.conf
+++ b/build/deb/lighttpd.conf
@@ -1,22 +0,0 @@
-# Alias for dolibarr directory
-alias.url += ( 
-	"/dolibarr" => "/usr/share/dolibarr/htdocs",
-)
-
-# Disallow access to libraries
-#$HTTP["url"] =~ "^/dolibarr/libraries" { 
-#    url.access-deny = ( "" ) 
-#}
-
-# Limit access to setup script
-#$HTTP["url"] =~ "^/dolibarr/setup" {
-#	auth.backend = "htpasswd"
-#	auth.backend.htpasswd.userfile = "/etc/dolibarr/htpasswd.setup"
-#	auth.require = (
-#		"/" => (
-#			"method" => "basic",
-#			"realm" => "Dolibarr Setup",
-#			"require" => "valid-user"
-#		)
-#	)
-#}
--- a/build/deb/menu
+++ b/build/deb/menu
@@ -0,0 +1,3 @@
+# 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
--- a/build/deb/po/POTFILES.in
+++ b/build/deb/po/POTFILES.in
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
--- a/build/deb/po/fr.po
+++ b/build/deb/po/fr.po
@@ -1,64 +0,0 @@
-#
-#    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-08-01 18:17+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: multiselect
-#. Description
-#: ../templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr "Seveur web à reconfigurer automatiquement:"
-
-#. Type: multiselect
-#. Description
-#: ../templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured to run "
-"dolibarr."
-msgstr ""
-"Selectionnez le serveur web à configurer automatiquement pour utiliser "
-"dolibarr."
-
-#
-#. Type: boolean
-#. Description
-#: ../templates:2001
-#, fuzzy
-msgid "Delete database and uploaded files ?"
-msgstr "Effacer la base de donnée et les fichiers uploadés ?"
-
-#
-#. Type: boolean
-#. Description
-#: ../templates:2001
-#, 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)."
--- a/build/deb/po/templates.pot
+++ b/build/deb/po/templates.pot
@@ -1,47 +0,0 @@
-# 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-08-01 18:17+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: multiselect
-#. Description
-#: ../templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured to run "
-"dolibarr."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-msgid "Delete database and uploaded files ?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:2001
-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 ""
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
 # postinst script for dolibarr
+#
+# see: dh_installdeb(1)

 set -e

@@ -14,31 +16,6 @@ set -e
 # for details, see /usr/share/doc/packaging-manual/


-
-
-lighttpd_install() {
-	if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
-		if which lighty-enable-mod >/dev/null 2>&1 ; then
-			echo "Add link for Lighttpd config file"
-			ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
-			# We enabled it
-			lighty-enable-mod dolibarr fastcgi-php
-		else
-			echo "Lighttpd not installed, skipping"
-		fi
-	fi
-}
-
-apache_install() {
-	webserver=$1
-	if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
-		echo "Add link for Apache config file"
-		ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
-	fi
-}
-
-
-
 . /usr/share/debconf/confmodule

 db_version 2.0
@@ -46,66 +23,81 @@ db_version 2.0

 echo Run the dolibarr postinst script

-
-# Define vars
-docdir='/var/lib/dolibarr/documents'
-installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
-installconfig="/etc/dolibarr/install.forced.php"
-config="/etc/dolibarr/conf.php"
-
-
 case "$1" in
 	configure)

-		# Remove lock file
-		rm -f $docdir/install.lock
+		# Copy include for apache.conf
+		fileorig="/usr/share/dolibarr/build/deb/apache.conf"
+		config="/etc/dolibarr/apache.conf"
+        mkdir -p /etc/dolibarr
+		cp -p $fileorig $config

-        # Create document directory for uploaded data files
-        mkdir -p $docdir
-        chown -R www-data:www-data $docdir
-        chmod -R 775 $docdir
-        chmod -R g+s $docdir
-
-		# Copy install config file (with matching Debian) values into target directory
+		# Create install.forced.php
+		fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
+		config="/usr/share/dolibarr/htdocs/install/install.forced.php"
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
 			# Load superuser login and pass
-			superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | sed -e 's/^user[ =]*//g')
-			superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | sed -e 's/^password[ =]*//g')
+			superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+			superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
 		fi
 		echo Mysql superuser found to use is $superuserlogin
 		if [ -z "$superuserlogin" ] ; then
-			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
+			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
 		else
-			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
 		fi
-		chown -R root:www-data $installconfig
-	   	chmod -R 660 $installconfig
 		
-		# Create an empty conf.php with permission to web server
-		if [ ! -f $config ]
+        # Create /var/lib/dolibarr/documents
+        mkdir -p /var/lib/dolibarr/documents
+        chown -R www-data.www-data /var/lib/dolibarr/documents;
+        chmod -R 775 /var/lib/dolibarr/documents;
+        chmod -R g+s /var/lib/dolibarr/documents;
+
+		# Create empty conf.php
+		if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
 		then 
-			echo Create empty file $config		
-			touch $config
-			chown -R root:www-data $config
-	    	chmod -R 660 $config
+			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
+			touch /usr/share/dolibarr/htdocs/conf/conf.php
+			chown -R www-data.www-data /usr/share/dolibarr/htdocs/conf/conf.php;
+	    	chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php;
 		fi

+		#db_reset "dolibarr/webserver"

-		db_get dolibarr/reconfigure-webserver
+		# Get the web server type (use db_get for interactive mode).
+#		db_get "dolibarr/webserver"		# Read value for webserver.
+#		webserver="$RET"

-		webservers="$RET"
+		case $webserver in
+			Apache)		webservers="apache2" ;;
+			Apache-SSL)	webservers="apache2-ssl" ;;
+			Both)		webservers="apache2 apache2-ssl" ;;
+			*)		    webservers="apache2 apache2-ssl" ;;
+		esac

 		# Set up web server.
-		for webserver in $webservers ; do
-			webserver=${webserver%,}
-			echo Complete config of server $webserver
+		for server in $webservers ; do
+			echo Complete config of server $server
+			
+			# Add info for PHP (obsolete)
+			#typestr='application/x-httpd-php'
+			#extension='.php'
+			#. /usr/share/wwwconfig-common/apache-addtype_all.sh
+			
+			# Enable PHP module (obsolete)
+			#. /usr/share/wwwconfig-common/apache-php.sh
+			#echo Result of enabling PHP modules: $status
 			
 			# Detect webuser and webgroup
 			webuser=
 			webgroup=

+			# Search in httpd.conf (obsolete)
+			#. /usr/share/wwwconfig-common/apache-run.get
+			#echo Web user.group found is $webuser.$webgroup
+
 			if [ -z "$webuser" ] ; then
 				webuser=www-data
 			fi
@@ -115,51 +107,81 @@ case "$1" in

 			echo Web user.group used is $webuser.$webgroup

-			# Set permissions to web server
-			chown -R $webuser:$webgroup /usr/share/dolibarr
-            chown -R root:$webgroup $config
+			#
+			# That may lead to problems if apache & apache-ssl do
+			# not have the same user/group.
+			#
+			chown -R $webuser.$webgroup /usr/share/dolibarr
+
+			includefile="/etc/dolibarr/apache.conf"
+			#echo "$includefile $server" 
+			. /usr/share/dolibarr/build/deb/apache-include_all.sh
+			test "$status" = "uncomment" -o "$status" = "include" && restart="$server $restart"
+			
+			# (useless)
+			#for index in index.php; do
+			#	. /usr/share/wwwconfig-common/apache-index_all.sh
+			#	test "$status" = "added" && restart="$server $restart"
+			#done
 		done

-		# Restart web server.
-		for webserver in $webservers; do
-			webserver=${webserver%,}
-			if [ "$webserver" = "lighttpd" ] ; then
-				lighttpd_install
-			else
-				apache_install $webserver
-			fi
-			# Reload webserver in any case, configuration might have changed
-			# Redirection of 3 is needed because Debconf uses it and it might 
-			# be inherited by webserver. See bug #446324.
-	        if [ -f /etc/init.d/$webserver ] ; then
-	            if [ -x /usr/sbin/invoke-rc.d ]; then
-    	            echo Restart web server $server using invoke-rc.d
-	    		    # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
-	                invoke-rc.d $webserver reload 3>/dev/null || true
-	            else
-	                echo Restart web server $server using $server reload
-	                /etc/init.d/$webserver reload 3>/dev/null || true
-	            fi
-	        fi
-		done
+		# Copy icon file
+		#echo "Copy icon file"
+		#fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm"
+		#target="/usr/share/pixmaps/"
+		#cp -f $fileorig $target

+		#echo "Install menu entry"
+		# This one is for Gnome ubuntu
+		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
+		#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
 		
-		echo ----------
-		echo "Call Dolibarr page http://localhost/dolibarr/ to complete the setup and use Dolibarr."
-		echo ----------
+		# 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"
+		if [ -f /usr/share/wwwconfig-common/restart.sh ] ;
+		then
+			. /usr/share/wwwconfig-common/restart.sh
+		else
+			# Another way to restart
+			for server in $servers ; do
+        		if [ -x /usr/sbin/invoke-rc.d ]; then
+        		    # This on works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
+        	    	invoke-rc.d $server reload || true
+        		else
+        	    	/etc/init.d/$server reload || true
+        		fi
+			done
+		fi
+		
+		echo "Launch Dolibarr on page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
 	;;

 	abort-upgrade|abort-remove|abort-deconfigure)
 	;;

 	*)
-		echo "postinst called with unknown argument $1" >&2
+		echo "postinst called with unknown argument \`$1'" >&2
 		exit 0
 	;;
 esac

-#DEBHELPER#
-
 db_stop

+#DEBHELPER#
+
 exit 0
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -17,118 +17,64 @@ set -e
 # for details, see /usr/share/doc/packaging-manual/


-
-lighttpd_remove() {
-	if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
-		echo "Remove link for Lighttpd config file"
-		rm -f /etc/lighttpd/conf-available/50-dolibarr.conf
-		if which lighty-enable-mod >/dev/null 2>&1 ; then
-			lighty-disable-mod dolibarr
-		else
-			echo "Lighttpd not installed, skipping"
-		fi
-		# See bug #448682
-		if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
-		    echo 'Manually deleting lighttpd/dolibarr configuration link'
-		    rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
-		fi
-	fi
-}
-
-apache_remove() {
-	if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then
-		echo "Remove link for Apache config file"
-		rm -f /etc/$webserver/conf.d/dolibarr.conf
-	fi
-}
-
-
-
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
+. /usr/share/debconf/confmodule

 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'
-config="/etc/dolibarr/conf.php"
-lockfile="$docdir/install.lock"
-
-
+# Allows us to loop and substitute in one pass
+case $webserver in
+	Apache)		webservers="apache2" ;;
+	Apache-SSL)	webservers="apache2-ssl" ;;
+	Both)		webservers="apache2 apache2-ssl" ;;
+	*)		    webservers="apache2 apache2-ssl" ;;
+esac
+export includefile=/etc/dolibarr/apache.conf

 case "$1" in
-
-    # Call when we upgrade
-	upgrade)
-		echo "postrm upgrade"
-	;;
-
-    # Call when we uninstall
-	remove)
-		echo "postrm remove"
-		rm -f $lockfile
-
-		# Reconfigure web server
-		db_get dolibarr/reconfigure-webserver
-
-		webservers="$RET"
-
-		# Restart web servers
-		for webserver in $webservers; do
-			webserver=${webserver%,}
-			if [ "$webserver" = "lighttpd" ] ; then
-				lighttpd_remove
-			else
-				apache_remove $webserver
-			fi
-			# Redirection of 3 is needed because Debconf uses it and it might 
-			# be inherited by webserver. See bug #446324.
-			if [ -f /etc/init.d/$webserver ] ; then
-				if [ -x /usr/sbin/invoke-rc.d ]; then
-					invoke-rc.d $webserver reload 3>/dev/null || true
-				else
-					/etc/init.d/$webserver reload 3>/dev/null || true
-				fi
-			fi
-		done
-	;;
-
-    # Call when we uninstall and purge
 	purge)
-		echo "postrm purge"
+		echo "postrm purge webservers=$webservers includefile=$includefile"

 		# Ask if we must delete database
 		echo "postrm db_input dolibarr/postrm"
-		db_input critical dolibarr/postrm || true
+		db_input critical "dolibarr/postrm" || true
 		db_go || true

 		echo "postrm db_get dolibarr/postrm"
 		# We disable set -e to avoid premature end of script if error
 		set +e
-		db_get dolibarr/postrm
+		db_get "dolibarr/postrm"
 		set -e
 	
 		if [ "$RET" = "true" ] ; then
 			echo postrm Mysql database deletion
 			# Get database configuration
 			dbserver="localhost"
-			dbuser="dolibarrdebian"
-			dbname="dolibarrdebian"
+			dbname="dolibarr"
 			#db_get "dolibarr/db/name"
 			#dbname="$RET"
 			superuserlogin=''
 			superuserpassword=''
 			if [ -f /etc/mysql/debian.cnf ] ; then
 				# Load superuser login and pass
-				superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | sed -e 's/^user[ =]*//g')
-				superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | sed -e 's/^password[ =]*//g')
+				superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+				superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
 			fi
 			echo postrm Mysql superuser found to use is $superuserlogin
 			dbadmin="$superuserlogin"
 			dbadmpass="$superuserpassword"
+			#db_get "dolibarr/db/admin/name"
+			#dbadmin="$RET"
+			#db_get "dolibarr/db/admin/password"
+			#dbadmpass="$RET"
 			dbtype="mysql"
 			
 			# To delete a mysql user (disabled)
@@ -177,62 +123,127 @@ 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."
-				if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
-				    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-					error="Database $dbname NOT successfully droped. You have to do it manually."
-					echo $error
-				    else
-					status=drop
-				    fi
-				else
-				    error="Unable to run the drop database script."
-					echo $error
-				fi
+			log="${log}Droping database $dbname."
+			if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
+			    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
+				error="Database $dbname NOT successfully droped. You have to do it manually."
+				echo $error
+			    else
+				status=drop
+			    fi
+			else
+			    error="Unable to run the drop database script."
+				echo $error
+			fi
 		    else
-				status=nothing
-				log="${log}Database $dbname already not exists."
+			status=nothing
+			log="${log}Database $dbname already not exists."
 		    fi

-		    echo "Remove directory $docdir"
-		    rm -rf $docdir ; 
- 
 		else
-			echo "postrm Delete of dolibarr database and uploaded files not wanted" 
+			echo "postrm Delete of dolibarr database not wanted" 
 		fi
 	
+		# Remove include files
+		for server in $webservers ; do
+			export error=""		
+			export conffile="/etc/$server/httpd.conf"
+			echo "postrm conffile=$conffile" 
+			if [ -f $conffile ] ;
+			then
+				if [ -s $conffile ] ;
+				then
+                    echo postrm remove dolibarr include from /etc/dolibarr/apache.conf
+					# We disable set -e to avoid premature end of script if error
+					set +e
+				    GREP="Include[[:space:]]\+$includefile\b"
+				    if grep -e "$GREP" $conffile > /dev/null 2>&1; then
+					log="${log}Include of $includefile found in $conffile file, purging."
+					status=purge
+					grep -v -e "$GREP" < $conffile > $conffile.purg
+					mv $conffile.purg $conffile
+					fi
+					# We restore blocking errors
+					set -e
+				fi
+			fi
+			if [ "$status" = "purge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+
 		rm -rf /etc/dolibarr

+		# Restart servers
+		servers="apache2-ssl apache2 mysql"
+		if [ -f /usr/share/wwwconfig-common/restart.sh ] ;
+		then
+			. /usr/share/wwwconfig-common/restart.sh
+		else
+			# Another way to restart
+			for server in $servers ; do
+                # We disable blocking errors
+                set +e
+                echo "Restart server $server if exists"
+        		if [ -x /usr/sbin/invoke-rc.d ]; then
+        		     invoke-rc.d $server reload || true
+        		else
+        		     /etc/init.d/$server reload || true
+        		fi
+        		# We restore blocking errors
+        		set -e
+			done
+		fi
+		
+		# 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/reconfigure-webserver
-		db_reset dolibarr/postrm
+		db_reset "dolibarr/postrm"
        set -e
        
-		#db_purge
+		db_purge
+	;;
+
+	remove)
+		echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
+		rm -fr /usr/share/dolibarr/htdocs/install
+
+		#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 update-menus; fi
+	;;
+
+	upgrade)
 	;;

 	failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;

 	*)
-		echo "postrm called with unknown argument $1" >&2
+		echo "postrm called with unknown argument \`$1'" >&2
 		exit 0
 	;;
 esac

-#DEBHELPER#
-
 db_stop

+#DEBHELPER#
+
 exit 0
--- a/build/deb/rules
+++ b/build/deb/rules
@@ -1,10 +1,100 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# This script is not used. The script used to build the root
+# for making Debian pakcage is build/makepack-dolibarr.pl
+#

 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_VERBOSE=1

-#export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3

-%:
-	dh $@
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	@# Add here commands to install the package into debian/dolibarr
+
+	install --mode=644 -D --group=www-data --owner=www-data \
+		DEBIAN/apache.conf \
+		debian/dolibarr/etc/dolibarr/apache.conf
+
+	mkdir -p debian/dolibarr/usr/share/dolibarr
+	cp -rp htdocs/* debian/dolibarr/usr/share/dolibarr/htdocs
+	mkdir -p debian/dolibarr/usr/share/dolibarr/documents
+	chmod -R 644 debian/dolibarr/usr/share/dolibarr
+
+	find debian/dolibarr/usr/share/dolibarr -type d | xargs chmod 755
+
+	find debian/dolibarr \( -name CVS -o -name .cvsignore \) | xargs rm -fr
+
+	mkdir -p debian/dolibarr/usr/lib/dolibarr
+	cp -rp scripts/* debian/dolibarr/usr/lib/dolibarr
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_movefiles
+
+	dh_installdebconf	
+	dh_installdocs
+#	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+#	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+#	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- a/build/deb/templates
+++ b/build/deb/templates
@@ -1,15 +1,102 @@
-Template: dolibarr/reconfigure-webserver
-Type: multiselect
-Choices: apache2, lighttpd
-Default: apache2, lighttpd
-_Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configured
- to run dolibarr.
+Template: dolibarr/configuration/note
+Type: note
+Description: Package configuration note.
+ Dolibarr can be and should be configured entirely via web, so, in the
+ following configuration steps, I'm going to prompt you for the passwords that
+ Dolibarr uses for web configuration and some default values for the
+ application startup. Then you should point your browser to the Dolibarr
+ setup, for example:
+ .
+ http://localhost/dolibarr/install.php
+ .
+ continue the configuration, fill the database and let Dolibarr be aware of
+ the installed modules.
+
+Template: dolibarr/webserver
+Type: select
+Choices: Apache, Apache-ssl, Both, None
+Description: Which Web Server are you running?
+ Dolibarr supports any web server with PHP capabilities, but this
+ configuration process only supports Apache and Apache-SSL.
+
+Template: dolibarr/db/setup/skip
+Type: boolean
+Default: false
+Description: DB setup skipped.
+ DB setup will be skipped.
+
+Template: dolibarr/db
+Type: text
+Description: Dolibarr DB setup NOTE.
+ Now you should specify the DBMS settings. You must provide the host name on
+ which the DBMS server is installed, the type (i.e.  MySql), the DB name, the DBMS administrator user-name, etc.
+
+Template: dolibarr/db/host
+Type: string
+Default: localhost
+Description: Please, insert your database host name:
+ This should be the host-name or IP address that dolibarr will use to access
+ the DB.
+
+Template: dolibarr/db/port
+Type: string
+Default: 3306
+Description: Please, insert your database port:
+ This should be the port value that Dolibarr will use to access
+ the DB.
+
+Template: dolibarr/db/name
+Type: string
+Default: dolibarr
+Description: Please, insert Dolibarr database name:
+ This is the name of the database that Dolibarr will use.
+
+Template: dolibarr/db/user/name
+Type: string
+Default: dolibarr
+Description: Please, insert the DBMS user-name to access the DB:
+ This is the user-name that Dolibarr will use to access the DB.
+
+Template: dolibarr/db/user/password
+Type: password
+Description: Please, insert the password to access the DB:
+ This is the password that Dolibarr will use, along with user-name you
+ provided, to access the DB.
+
+Template: dolibarr/db/user/password/confirm
+Type: password
+Description: Please, retype the password to access the DB:
+ Please insert the DB access password again. If the password you are going to
+ retype mismatch the previous inserted one, I'll ask you to insert them again.
+
+Template: dolibarr/db/user/password/mismatch
+Type: text
+Description: Passwords mismatch.
+ The DB access passwords you inserted mismatch. Please, try again.
+
+Template: dolibarr/db/admin/name
+Type: string
+Default: root
+Description: Please, insert the DBMS administrator user-name:
+ This user-name will be used to access the DBMS to create (if needed):
+ .
+  (1) The new Dolibarr database
+  (2) The new database account that Dolibarr will use to access the DB
+ .
+ It should be 'root' for MySql.
+
+Template: dolibarr/db/admin/password
+Type: password
+Description: Please, insert the DBMS administrator password (if any):
+ This is the password that will be used along with the DBMS administrator
+ user-name.
+ .
+ NOTE: This password will not be asked twice, since it's not a new password.

 Template: dolibarr/postrm
 Type: boolean
-Default: false
-_Description: Delete database and uploaded files ?
- 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).
+Default: true
+Description: Delete database ?
+ Do I have to delete also the Dolibarr MySQL database and all its datas
+ (datas subjected to this quetion are the Dolibarr DBMS account and all
+ Dolibarr tables) ?
--- a/build/deb/templates.futur
+++ b/build/deb/templates.futur
@@ -1,105 +0,0 @@
-#Template: dolibarr/configuration/note
-#Type: note
-#Description: Package configuration note
-# Dolibarr can be and should be configured entirely via web, so, in the
-# following configuration steps, I'm going to prompt you for the passwords that
-# Dolibarr uses for web configuration and some default values for the
-# application startup. Then you should point your browser to the Dolibarr
-# setup, for example:
-# .
-# http://localhost/dolibarr/install.php
-# .
-# continue the configuration, fill the database and let Dolibarr be aware of
-# the installed modules.
-
-#Template: dolibarr/webserver
-#Type: select
-#Choices: Apache, Apache-ssl, Both, None
-#Description: Which Web Server are you running ?
-# Dolibarr supports any web server with PHP capabilities, but this
-# configuration process only supports Apache and Apache-SSL.
-
-#Template: dolibarr/db
-#Type: text
-#Description: Dolibarr DB setup note
-# Now you should specify the DBMS settings. You must provide the host name on
-# which the DBMS server is installed, the type (i.e.  MySql), the DB name, the DBMS administrator user-name, etc.
-
-#Template: dolibarr/db/host
-#Type: string
-#Default: localhost
-#Description: Please, insert your database host name:
-# This should be the host-name or IP address that dolibarr will use to access
-# the DB.
-
-#Template: dolibarr/db/port
-#Type: string
-#Default: 3306
-#Description: Please, insert your database port:
-# This should be the port value that Dolibarr will use to access
-# the DB.
-
-#Template: dolibarr/db/name
-#Type: string
-#Default: dolibarr
-#Description: Please, insert Dolibarr database name:
-# This is the name of the database that Dolibarr will use.
-
-#Template: dolibarr/db/user/name
-#Type: string
-#Default: dolibarr
-#Description: Please, insert the DBMS user-name to access the DB:
-# This is the user-name that Dolibarr will use to access the DB.
-
-#Template: dolibarr/db/user/password
-#Type: password
-#Description: Please, insert the password to access the DB:
-# This is the password that Dolibarr will use, along with user-name you
-# provided, to access the DB.
-
-#Template: dolibarr/db/user/password/confirm
-#Type: password
-#Description: Please, retype the password to access the DB:
-# Please insert the DB access password again. If the password you are going to
-# retype mismatch the previous inserted one, I'll ask you to insert them again.
-
-#Template: dolibarr/db/user/password/mismatch
-#Type: text
-#Description: Passwords mismatch
-# The DB access passwords you inserted mismatch. Please, try again.
-
-#Template: dolibarr/db/admin/name
-#Type: string
-#Default: root
-#Description: Please, insert the DBMS administrator user-name:
-# This user-name will be used to access the DBMS to create (if needed):
-# .
-#  (1) The new Dolibarr database
-#  (2) The new database account that Dolibarr will use to access the DB
-# .
-# It should be 'root' for MySql.
-
-#Template: dolibarr/db/admin/password
-#Type: password
-#Description: Please, insert the DBMS administrator password (if any):
-# This is the password that will be used along with the DBMS administrator
-# user-name.
-# .
-# NOTE: This password will not be asked twice, since it's not a new password.
-
-Template: dolibarr/postrm
-Type: boolean
-Default: true
-Description: Delete database ?
- Delete the Dolibarr MySQL database and all its datas (datas related
- to this quetion are the Dolibarr DBMS account and all
- Dolibarr tables) ?
-
-#Template: dolibarr/postrmfile
-#Type: boolean
-#Default: true
-#Description: Delete attached files ?
-# Delete also all uploaded and generated files (datas related
-# to this quetion are all files found into /usr/share/dolibarr/documents,
-# uploaded or generated when using Dolibarr) ?
- 
--- a/build/dmg/dolimamp/install.forced.php
+++ b/build/dmg/dolimamp/install.forced.php
@@ -2,7 +2,6 @@
 $force_install_message='KeepDefaultValuesMamp';
 $force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
 $force_install_type='mysqli';
-$force_install_dbserver='localhost';
 $force_install_port='8889';
 $force_install_database='dolibarr';
 $force_install_createdatabase='1';
--- a/build/doap/doap_dolibarr.rdf
+++ b/build/doap/doap_dolibarr.rdf
@@ -0,0 +1,81 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns="http://usefulinc.com/ns/doap#">
+
+	<name>Dolibarr ERP/CRM</name>
+	<homepage rdf:resource="http://www.dolibarr.org" />
+	<created>2003-09-01</created>
+
+	<shortdesc xml:lang="fr">Dolibarr ERP/CRM, le logiciel simple de gestion d'entreprise et associations.</shortdesc>
+	<shortdesc xml:lang="es">Dolibarr ERP/CRM es un software de Planificación de recursos empresariales y administración de la relación con los clientes.</shortdesc>
+	<shortdesc xml:lang="no">Dolibarr ERP/CRM er en fri programpakke utgitt med åpen kildekode for små og mellomstore bedrifter, organisasjoner og konsulenter.</shortdesc>
+	<shortdesc xml:lang="en">Dolibarr ERP/CRM is a free opensource software to manage small and medium companies, foundations or freelancers.</shortdesc>
+
+	<description xml:lang="fr">Dolibarr ERP/CRM est un logiciel simple de gestion des TPE/PME, indépendants, autoentrepreneurs et associations.</description>
+	<description xml:lang="es">Dolibarr ERP/CRM es un software de Planificación de recursos empresariales (PRE, ERP en inglés) y administración de la relación con los clientes (CRM en inglés) open source para la Pequeña y mediana empresa, autónomos o asociaciones.</description>
+	<description xml:lang="no">Dolibarr ERP/CRM er en fri programpakke utgitt med åpen kildekode for små og mellomstore bedrifter, organisasjoner og konsulenter. Programmet har en rekke funksjoner for Enterprise resource planning (ERP), kunderelasjonshåndtering (CRM) og andre aktiviteter.</description>
+	<description xml:lang="en">Dolibarr ERP/CRM is an open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also other features for different activities.</description>
+
+	<mailing-list rdf:resource="http://lists.nongnu.org/mailman/listinfo/dolibarr-dev" />
+    <mailing-list rdf:resource="http://lists.nongnu.org/mailman/listinfo/dolibarr-user" />
+
+    <download-page rdf:resource="http://www.dolibarr.org/downloads/cat_view/62-stable-versions" />
+
+	<maintainer>
+		<foaf:Person>
+			<foaf:name>Dolibarr Team</foaf:name>
+			<foaf:homepage rdf:resource="http://www.dolibarr.org" />
+		</foaf:Person>
+	</maintainer>
+
+	<translator>
+		<foaf:Person>
+			<foaf:name>Laurent Destailleur</foaf:name>
+			<foaf:mbox rdf:resource="mailto:eldy@users.sourceforge.net" />
+			<rdfs:seeAlso rdf:resource="http://wiki.dolibarr.org/index.php/Translator_documentation" />
+		</foaf:Person>
+	</translator>
+	<maintainer>
+		<foaf:Person>
+			<foaf:name>Laurent Destailleur</foaf:name>
+			<foaf:mbox rdf:resource="mailto:eldy@users.sourceforge.net" />
+			<rdfs:seeAlso rdf:resource="http://wiki.dolibarr.org/index.php/Translator_documentation" />
+		</foaf:Person>
+	</maintainer>
+	
+	<!-- currently supported versions -->
+	<release>
+		<Version>
+			<name>stable</name>
+			<created>2011-02-09</created>
+			<revision>3.0.0</revision>
+		</Version>
+	</release>
+
+	<!-- Freshmeat -->
+	<category rdf:resource="http://software.freshmeat.net/tags/officebusiness" />
+	<!-- Sourceforge category: -->
+    <category rdf:resource="http://sourceforge.net/softwaremap/trove_list.php?form_cat=129" />
+
+	<license rdf:resource="http://wiki.dolibarr.org/index.php/FAQ_What_is_Dolibarr_licence_%3F" />
+
+	<screenshots rdf:resource="http://wiki.dolibarr.org/index.php/Screenshots" />
+
+    <!-- source repository -->
+    <repository>
+        <CVSRepository>
+            <anon-root>:pserver:anonymous@cvs.savannah.nongnu.org:/sources/dolibarr</anon-root>
+            <module>dolibarr</module>
+            <browse rdf:resource="http://cvs.savannah.nongnu.org/viewvc/dolibarr/?root=dolibarr" />
+        </CVSRepository>
+
+		<!--
+		<SVNRepository>
+			<location rdf:resource="http://sv..." />
+			<browse rdf:resource="http://cvs.savannah.nongnu.org/viewvc/dolibarr/?root=dolibarr" />
+		</SVNRepository>
+		-->
+    </repository>
+
+</Project>
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.7.1

 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER = 3.1.1
+PROJECT_NUMBER = 3.0.0

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -105,7 +105,7 @@ INLINE_INHERITED_MEMB = NO
 # path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.

-FULL_PATH_NAMES = YES
+FULL_PATH_NAMES = NO

 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
 # can be used to strip a user-defined part of the path. Stripping is
@@ -114,7 +114,7 @@ FULL_PATH_NAMES = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.

-STRIP_FROM_PATH = "/media/DATA/Mes Developpements/dolibarr"
+STRIP_FROM_PATH = 

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -611,7 +611,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.

-EXCLUDE = ../../mssql ../../mysql ../../pgsql ../../CVS ../../build ../../dev ../../doc ../../documents ../../htdocs/conf/conf.php ../../htdocs/includes/adodbtime ../../htdocs/includes/artichow ../../htdocs/includes/barcode ../../htdocs/includes/ckeditor ../../htdocs/includes/efc_xfss ../../htdocs/includes/fckeditor ../../htdocs/includes/flot ../../htdocs/includes/fpdf ../../htdocs/includes/geoip ../../htdocs/includes/jquery ../../htdocs/includes/magpierss ../../htdocs/includes/nusoap ../../htdocs/includes/odtphp ../../htdocs/includes/pear ../../htdocs/includes/phpexcel ../../htdocs/includes/php_writeexcel ../../htdocs/includes/phplot ../../htdocs/includes/phplot5 ../../htdocs/includes/pwc ../../htdocs/includes/scriptaculous ../../htdocs/includes/simplemail ../../htdocs/includes/smarty ../../htdocs/includes/smtps ../../htdocs/includes/tcpdf ../../htdocs/includes/vcard ../../htdocs/cashdesk/include/jscalendar ../../htdocs/avoir ../../htdocs/document ../../htdocs/documents ../../htdocs/lolix ../../htdocs/postnuke ../../htdocs/rapport ../../htdocs/telephonie ../../htdocs/voyage ../../htdocs/oscommerce_ws/ws_client_demo ../../htdocs/oscommerce_ws/ws_server ../../scripts/addons ../../scripts/courrier ../../scripts/lolix ../../scripts/energie
+EXCLUDE = ../../mssql ../../mysql ../../pgsql ../../CVS ../../build ../../dev ../../doc ../../documents ../../htdocs/conf/conf.php ../../htdocs/includes/adodbtime ../../htdocs/includes/artichow ../../htdocs/includes/barcode ../../htdocs/includes/ckeditor ../../htdocs/includes/efc_xfss ../../htdocs/includes/fckeditor ../../htdocs/includes/fpdf ../../htdocs/includes/geoip ../../htdocs/includes/jquery ../../htdocs/includes/magpierss ../../htdocs/includes/nusoap ../../htdocs/includes/odtphp ../../htdocs/includes/pear ../../htdocs/includes/php_excelreader ../../htdocs/includes/php_writeexcel ../../htdocs/includes/phplot ../../htdocs/includes/phplot5 ../../htdocs/includes/pwc ../../htdocs/includes/scriptaculous ../../htdocs/includes/simplemail ../../htdocs/includes/smarty ../../htdocs/includes/smtps ../../htdocs/includes/tcpdf ../../htdocs/includes/vcard ../../htdocs/cashdesk/include/jscalendar ../../htdocs/avoir ../../htdocs/document ../../htdocs/documents ../../htdocs/lolix ../../htdocs/postnuke ../../htdocs/rapport ../../htdocs/telephonie ../../htdocs/voyage ../../htdocs/oscommerce_ws/ws_client_demo ../../htdocs/oscommerce_ws/ws_server ../../scripts/addons ../../scripts/courrier ../../scripts/lolix ../../scripts/energie

 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -796,15 +796,13 @@ HTML_FILE_EXTENSION = .html
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header.

-# Does not work with 1.7.3
-#HTML_HEADER = doxygen_header.html
+HTML_HEADER = 

 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.

-# Does not work with 1.7.3
-HTML_FOOTER = doxygen_footer.html
+HTML_FOOTER = 

 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -1003,7 +1001,7 @@ QHG_LOCATION =
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.

-GENERATE_ECLIPSEHELP = YES
+GENERATE_ECLIPSEHELP = NO

 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
@@ -1444,7 +1442,7 @@ PERL_PATH = /usr/bin/perl
 # fallback. It is recommended to install and use dot, since it yields more
 # powerful graphs.

-CLASS_DIAGRAMS = NO
+CLASS_DIAGRAMS = YES

 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see
@@ -1459,14 +1457,14 @@ MSCGEN_PATH =
 # inheritance and usage relations if the target is undocumented
 # or is not a class.

-HIDE_UNDOC_RELATIONS = NO
+HIDE_UNDOC_RELATIONS = YES

 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz, a graph visualization
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)

-HAVE_DOT = YES
+HAVE_DOT = NO

 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
 # allowed to run in parallel. When set to 0 (the default) doxygen will
--- a/build/doxygen/doxygen_footer.html
+++ b/build/doxygen/doxygen_footer.html
@@ -1,43 +0,0 @@
-<!-- 
-File added into doxygen generated documentation
-->
-
-
-<!-- Google analytics -->
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-9049390-1']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-<!-- End google analytics -->
-
-
-<hr class="footer" />
-<address class="footer"><small>Generated on $datetime
-for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen </a> $doxygenversion </small></address>
-
-
-<!--  Google AdSense -->
-<center>
-<script type="text/javascript"><!--
-google_ad_client = "pub-1071905880519467";
-/* PUBBANDEAUDOLIBARR */
-google_ad_slot = "1421205532";
-google_ad_width = 468;
-google_ad_height = 60;
-//-->
-</script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
-</center>
-<!-- End google adsense -->
-
-</body>
-</html>
--- a/build/doxygen/doxygen_header.html
+++ b/build/doxygen/doxygen_header.html
@@ -1,63 +0,0 @@
-<!-- 
-File added into doxygen generated documentation
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>$title</title>
-<!--  from dolibarr.org -->
-<meta http-equiv="Content-Type" content="text/html" charset=utf-8 />
-<meta name="verify-v1"
-	content="5uTEtcSaRHlZVnb3L4x4QrpRzdw3zMZ51+mJxf/4Cd8=" />
-<meta name="verify-v1"
-	content="ygCOli7T1nnmmIz2ikasGV2Y+1DLmLcsblrDp+tSo/Q=" />
-<link href="tabs.css" rel="stylesheet" type="text/css" />
-<link href="doxygen.css" rel="stylesheet" type="text/css" />
-<!-- End from dolibarr.org -->
-</head>
-<body>
-<div id="top">
-
-<div class="topmaincol">
-<div class="divpath">
-</div>
-</div>
-
-<div id="logodol">
-<center>
-<table width="100%">
-	<tr>
-		<td><div id="projectname">$projectname</div> - <span id="projectnumber">$projectnumber</span></td>
-		<td align="right"><!-- banner start -->
-		<table cellpadding="0" cellspacing="0" class="moduletablemybanner">
-			<tr>
-				<td>
-				<div class="bannergroupmybanner">
-
-				<div class="banneritemmybanner">
-<script type="text/javascript"><!--
-google_ad_client = "pub-1071905880519467";
-/* PUBBANDEAUDOLIBARR */
-google_ad_slot = "1421205532";
-google_ad_width = 468;
-google_ad_height = 60;
-//-->
-</script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
-				<div class="clr"></div>
-				</div>
-
-				</div>
-				</td>
-			</tr>
-		</table>
-		<!-- banner end --></td>
-	</tr>
-</table>
-</center>
-
-</div>
-
-<!-- End doxygen_header.html -->
-
-
--- a/build/doxygen/hudson-doxygen.doxyfile
+++ b/build/doxygen/hudson-doxygen.doxyfile
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -38,7 +38,3 @@ LaunchNow=Llan
 ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant aix<69> tots els seus arxius de dades es troben encara al directori %1. Haur<75> eliminar aquest directori manualment per a una desinstal completa.

 DoliWampWillStartApacheMysql=L'instal<61>lador DoliWamp intentar<61> iniciar o reiniciar Apache i MySQL, aix<69> pot durar des de diversos segons a un minut despr<70>s de la confirmaci<63>. Iniciar la instal<61>laci<63> o actualitzaci<63> dels servidors web i bases de dades requerides per Dolibarr?
-
-OldVersionFoundAndMoveInNew=S'ha trobat una versi<73> antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versi<73> de Dolibarr
-OldVersionFoundButFailedToMoveInNew=S'ha trobat una versi<73> antiga de base de dades, per<65> no es pot moure per a ser utilitzada per la nova versi<73> de Dolibarr
-
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -37,8 +37,4 @@ LaunchNow=Lanzar ahora Dolibarr

 ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todav<61>a en el directorio %1. Deber<65> eliminar este directorio manualmente para una desinstalaci<63>n completa.

-DoliWampWillStartApacheMysql=El instalador DoliWamp intentar<61> iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto despu<70>s de la confirmaci<63>n. <20>Iniciar la instalaci<63>n o actualizaci<63>n de los servidores Web y bases de datos requeridas por Dolibarr?
-
-OldVersionFoundAndMoveInNew=Se ha encontrado una versi<73>n antigua de base de datos y ha sido movida para ser utilizada por la nueva versi<73>n de Dolibarr
-OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versi<73>n antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versi<73>n de Dolibarr
- 	  	 
+DoliWampWillStartApacheMysql=El instalador DoliWamo intentar<61> iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto despu<70>s de la confirmaci<63>n. <20>Iniciar la instalaci<63>n o actualizaci<63>n de los servidores Web y bases de datos requeridas por Dolibarr?
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,6 +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$
 ;----------------------------------------------------------------------------------------


@@ -17,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.1
+AppVerName=DoliWamp-3.0.0
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.1
+OutputBaseFilename=DoliWamp-3.0.0
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=c:\Documents and Settings\ldestail\git\dolibarr
+SourceDir=C:\Work\Data\Workspace\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -100,18 +101,18 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
 Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,telephonie\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\install.forced.php,*\modBookmark4u.class.php,*\modDocument.class.php,*\modDroitPret.class.php,*\modEditeur.class.php,*\modPostnuke.class.php,*\modTelephonie.class.php,*\interface_modEditeur_Editeur.class.php*,*\bureau2crea,*\rodolphe"
-Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,xdebug\*"
-Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
+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,default.properties,install.lock"
+Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; 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;
@@ -396,7 +397,7 @@ begin


    // Remove lock file
-    lockfile := pathWithSlashes+'/dolibarr_documents/install.lock';
+    lockfile := pathWithSlashes+'/www/dolibarr/install.lock';
    if FileExists (lockfile) and not DeleteFile(lockfile) then
    begin
      themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -745,7 +745,7 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
 #TODO

-# OPTIMIZE: To use cache on static pages (A259200 = 1 month).
+# OPTIMIZE: To use cache on static pages.
 # Note that you must also enable the module mod_expires.
 #ExpiresActive On
 #ExpiresByType image/x-icon A2592000
@@ -755,7 +755,6 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 #ExpiresByType text/css A2592000
 #ExpiresByType text/javascript A2592000
 #ExpiresByType application/x-javascript A2592000
-#ExpiresByType application/javascript A2592000


 # Declare alias for Dolibarr, PHPMyAdmin and other softwares
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
@@ -51,7 +51,7 @@ $langues = array(
 		'txtNoProjet' => 'No other softwares. To create a new one, just create a directory in \'www\'.',
 		'txtApp' => 'Applications',
 		'FromLocalNetwork' => 'URL for local access',
-		'FromInternet' => 'URL for Intranet or Internet',
+		'FromInternet' => 'URL for Internet',
 		'NotAvailable' => 'Not available',
 		'faq' => 'http://www.en.wampserver.com/faq.php',
 		'ipserver' => 'Name/IP Server:',
@@ -76,7 +76,7 @@ $langues = array(
 		'txtNoProjet' => 'Pas d\'autre application. Pour en ajouter une nouvelle, cr&eacute;ez simplement un r&eacute;pertoire dans \'www\'.',
 		'txtApp' => 'Applications',
 		'FromLocalNetwork' => 'URL accès local',
-		'FromInternet' => 'URL accès par Intranet ou Internet',
+		'FromInternet' => 'URL accès par Internet',
 		'NotAvailable' => 'Non disponible',
 		'faq' => 'http://www.wampserver.com/faq.php',
 		'ipserver' => 'Name/IP Serveur:',
@@ -100,8 +100,8 @@ $langues = array(
 		'txtProjet' => 'Otras aplicaciones (sin alias)',
 		'txtNoProjet' => 'Ninguna otra aplicaci&oacute;n. Para a&ntilde;adir una nueva, simplemente cree una carpeta en \'www\'.',
 		'txtApp' => 'Aplicaciones',
-		'FromLocalNetwork' => 'URL para local access',
-		'FromInternet' => 'URL para Intranet o Internet',
+		'FromLocalNetwork' => 'URL for local access',
+		'FromInternet' => 'URL for Internet',
 		'NotAvailable' => 'Not available',
 		'faq' => 'http://www.wampserver.com/faq.php',
 		'ipserver' => 'Nombre/IP Servidor',
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -1,16 +1,7 @@
 <?php
-// File to force Dolibarr wizard installer choices.
-//
-// This file must be present into htdocs/install directory
-// during install process to be used.
-//
-// $Id: install.forced.php.install,v 1.16 2011/07/30 14:56:12 eldy Exp $
-//
-$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
 $force_install_type='mysqli';
-$force_install_dbserver='localhost';
 $force_install_port='WAMPMYSQLPORT';
 $force_install_database='dolibarr';
 $force_install_createdatabase='1';
@@ -22,6 +13,4 @@ $force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='644';
-
-$force_install_module='';
 ?>
--- a/build/exe/doliwamp/rundoliwamp.bat.install
+++ b/build/exe/doliwamp/rundoliwamp.bat.install
@@ -3,7 +3,7 @@ REM Launch Dolibarr
 REM ---------------

 REM If no lock file, we call install process
-IF NOT EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/
+IF NOT EXIST www\dolibarr\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/

 REM If lock file exists, we call home page
-IF EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/
+IF EXIST www\dolibarr\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
--- a/build/makepack-dolibarrlang.pl
+++ b/build/makepack-dolibarrlang.pl
@@ -2,302 +2,313 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarrlang.pl
 # \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \version      $Revision: 1.9 $
+# \version      $Revision$
 # \author       (c)2005 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

 use Cwd;

-$PROJECT = "dolibarr";
+$PROJECT="dolibarr";

-@LISTETARGET       = ("TGZ");    # Possible packages
-%REQUIREMENTTARGET = (           # Tool requirement for each package
-	"TGZ" => "tar",
-	"ZIP" => "7z",
-	"EXE" => "makensis.exe"
+@LISTETARGET=("TGZ");   # Possible packages
+%REQUIREMENTTARGET=(    # Tool requirement for each package
+"TGZ"=>"tar",
+"ZIP"=>"7z",
+"RPM"=>"rpmbuild",
+"DEB"=>"dpkg-buildpackage",
+"EXE"=>"makensis.exe"
 );
-%ALTERNATEPATH = (
-	"7z"           => "7-ZIP",
-	"makensis.exe" => "NSIS"
+%ALTERNATEPATH=(
+"7z"=>"7-ZIP",
+"makensis.exe"=>"NSIS"
 );

+
 use vars qw/ $REVISION $VERSION /;
-$REVISION = '$Revision: 1.9 $';
-$REVISION =~ /\s(.*)\s/;
-$REVISION = $1;
-$VERSION  = "1.0 (build $REVISION)";
+$REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$VERSION="1.0 (build $REVISION)";
+
+

 #------------------------------------------------------------------------------
 # MAIN
 #------------------------------------------------------------------------------
-( $DIR  = $0 ) =~ s/([^\/\\]+)$//;
-( $PROG = $1 ) =~ s/\.([^\.]*)$//;
-$Extension = $1;
-$DIR ||= '.';
-$DIR =~ s/([^\/\\])[\\\/]+$/$1/;
+($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
+$DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;

 # Detect OS type
 # --------------
-if ( "$^O" =~ /linux/i || ( -d "/etc" && -d "/var" && "$^O" !~ /cygwin/i ) ) {
-	$OS = 'linux';
-	$CR = '';
-}
-elsif ( -d "/etc" && -d "/Users" ) { $OS = 'macosx'; $CR = ''; }
-elsif ( "$^O" =~ /cygwin/i || "$^O" =~ /win32/i ) {
-	$OS = 'windows';
-	$CR = "\r";
-}
-if ( !$OS ) {
-	print "makepack-dolbarrlang.pl was not able to detect your OS.\n";
+if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
+elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
+elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
+if (! $OS) {
+    print "makepack-dolbarrlang.pl was not able to detect your OS.\n";
 	print "Can't continue.\n";
 	print "makepack-dolibarrlang.pl aborted.\n";
-	sleep 2;
+    sleep 2;
 	exit 1;
 }

 # Define buildroot
 # ----------------
-if ( $OS =~ /linux/ ) {
-	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
+if ($OS =~ /linux/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
-if ( $OS =~ /macos/ ) {
-	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
+if ($OS =~ /macos/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
-if ( $OS =~ /windows/ ) {
-	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "c:/temp";
-	$PROGPATH = $ENV{"ProgramFiles"};
+if ($OS =~ /windows/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+    $PROGPATH=$ENV{"ProgramFiles"};
 }
-if ( !$TEMP || !-d $TEMP ) {
-	print "Error: A temporary directory can not be find.\n";
-	print "Check that TEMP or TMP environment variable is set correctly.\n";
+if (! $TEMP || ! -d $TEMP) {
+    print "Error: A temporary directory can not be find.\n";
+    print "Check that TEMP or TMP environment variable is set correctly.\n";
 	print "makepack-dolibarrlang.pl aborted.\n";
-	sleep 2;
-	exit 2;
+    sleep 2;
+    exit 2;
 } 
-$BUILDROOT = "$TEMP/dolibarr-buildroot";
+$BUILDROOT="$TEMP/dolibarr-buildroot";

-my $copyalreadydone = 0;
-my $batch           = 0;
+
+my $copyalreadydone=0;
+my $batch=0;

 print "Makepack langs version $VERSION\n";
 print "Enter language code to package (en_US, fr_FR, ...) : ";
-$PROJECT = <STDIN>;
+$PROJECT=<STDIN>;
 chomp($PROJECT);
-
+# TODO Autodetect version
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
-$PROJVERSION = <STDIN>;
+$PROJVERSION=<STDIN>;
 chomp($PROJVERSION);
-( $MAJOR, $MINOR ) = split( /\./, $PROJVERSION, 2 );
-if ( $MINOR eq '' ) {
+($MAJOR,$MINOR)=split(/\./,$PROJVERSION,2);
+if ($MINOR eq '')
+{
 	print "Enter value for minor version: ";
-	$MINOR = <STDIN>;
+	$MINOR=<STDIN>;
 	chomp($MINOR);
 }

-$FILENAME    = "$PROJECT";
-$FILENAMETGZ = "lang_$PROJECT-$MAJOR.$MINOR";
-if ( -d "/usr/src/redhat" ) {

-	# redhat
-	$RPMDIR = "/usr/src/redhat";
+$FILENAME="$PROJECT";
+$FILENAMETGZ="lang_$PROJECT-$MAJOR.$MINOR";
+if (-d "/usr/src/redhat") {
+    # redhat
+    $RPMDIR="/usr/src/redhat";
 }
-if ( -d "/usr/src/RPM" ) {
-
-	# mandrake
-	$RPMDIR = "/usr/src/RPM";
+if (-d "/usr/src/RPM") {
+    # mandrake
+    $RPMDIR="/usr/src/RPM";
 }

-$SOURCE = "$DIR/../../dolibarr";
-$DESTI  = "$SOURCE/build";
+$SOURCE="$DIR/../../dolibarr";
+$DESTI="$SOURCE/build";
+

 # Choose package targets
 #-----------------------
-$target = "ZIP";    # Les langs sont au format zip
+$target="TGZ";    # Les langs sont au format tgz
 if ($target) {
-	$CHOOSEDTARGET{ uc($target) } = 1;
+    $CHOOSEDTARGET{uc($target)}=1;
 }
 else {
-	my $found = 0;
-	my $NUM_SCRIPT;
-	while ( !$found ) {
-		my $cpt = 0;
-		printf( " %d - %3s    (%s)\n",
-			$cpt, "All", "Need " . join( ",", values %REQUIREMENTTARGET ) );
-		foreach my $target (@LISTETARGET) {
-			$cpt++;
-			printf( " %d - %3s    (%s)\n",
-				$cpt, $target, "Need " . $REQUIREMENTTARGET{$target} );
-		}
+    my $found=0;
+    my $NUM_SCRIPT;
+    while (! $found) {
+    	my $cpt=0;
+    	printf(" %d - %3s    (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET));
+    	foreach my $target (@LISTETARGET) {
+    		$cpt++;
+    		printf(" %d - %3s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
+    	}
    
-		# Are asked to select the file to move
-		print "Choose one package number or several separated with space: ";
-		$NUM_SCRIPT = <STDIN>;
-		chomp($NUM_SCRIPT);
-		if ( $NUM_SCRIPT =~ s/-//g ) {
-
-			# Do not do copy
-			$copyalreadydone = 1;
-		}
-		if ( $NUM_SCRIPT !~ /^[0-$cpt\s]+$/ ) {
-			print "This is not a valid package number list.\n";
-			$found = 0;
-		}
-		else {
-			$found = 1;
-		}
-	}
-	print "\n";
-	if ($NUM_SCRIPT) {
-		foreach my $num ( split( /\s+/, $NUM_SCRIPT ) ) {
-			$CHOOSEDTARGET{ $LISTETARGET[ $num - 1 ] } = 1;
-		}
-	}
-	else {
-		foreach my $key (@LISTETARGET) {
-			$CHOOSEDTARGET{$key} = 1;
-		}
-	}
+    	# Are asked to select the file to move
+    	print "Choose one package number or several separated with space: ";
+    	$NUM_SCRIPT=<STDIN>; 
+    	chomp($NUM_SCRIPT);
+    	if ($NUM_SCRIPT =~ s/-//g) {
+    		# Do not do copy	
+    		$copyalreadydone=1;
+    	}
+    	if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/)
+    	{
+    		print "This is not a valid package number list.\n";
+    		$found = 0;
+    	}
+    	else
+    	{
+    		$found = 1;
+    	}
+    }
+    print "\n";
+    if ($NUM_SCRIPT) {
+    	foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
+    		$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+    	}
+    }
+    else {
+    	foreach my $key (@LISTETARGET) {
+    	    $CHOOSEDTARGET{$key}=1;
+        }
+    }
 }

 # Test if requirement is ok
 #--------------------------
-foreach my $target ( keys %CHOOSEDTARGET ) {
-	foreach my $req ( split( /[,\s]/, $REQUIREMENTTARGET{$target} ) ) {
+foreach my $target (keys %CHOOSEDTARGET) {
+    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
+        # Test    
+        print "Test requirement for target $target: Search '$req'... ";
+        $ret=`"$req" 2>&1`;
+        $coderetour=$?; $coderetour2=$coderetour>>8;
+        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+            # Not found error, we try in PROGPATH
+            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+            $coderetour=$?; $coderetour2=$coderetour>>8;
+            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+        }    

-		# Test
-		print "Test requirement for target $target: Search '$req'... ";
-		$ret         = `"$req" 2>&1`;
-		$coderetour  = $?;
-		$coderetour2 = $coderetour >> 8;
-		if (
-			$coderetour != 0
-			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
-				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
-			&& $PROGPATH
-		  )
-		{
-
-			# Not found error, we try in PROGPATH
-			$ret         = `"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-			$coderetour  = $?;
-			$coderetour2 = $coderetour >> 8;
-			$REQUIREMENTTARGET{$target} = "$PROGPATH/$ALTERNATEPATH{$req}/$req";
-		}
-
-		if (
-			$coderetour != 0
-			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
-				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
-		  )
-		{
-
-			# Not found error
-			print
-"Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-			$CHOOSEDTARGET{$target} = -1;
-			last;
-		}
-		else {
-
-			# Pas erreur ou erreur autre que programme absent
-			print " Found " . $REQUIREMENTTARGET{$target} . "\n";
-		}
-	}
+        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+            # Not found error
+            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+            $CHOOSEDTARGET{$target}=-1;
+            last;
+        } else {
+            # Pas erreur ou erreur autre que programme absent
+            print " Found ".$REQUIREMENTTARGET{$target}."\n";
+        }
+    }
 }

 print "\n";

 # Check if there is at least on target to build
 #----------------------------------------------
-$nboftargetok = 0;
-foreach my $target ( keys %CHOOSEDTARGET ) {
-	if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
-	$nboftargetok++;
+$nboftargetok=0;
+foreach my $target (keys %CHOOSEDTARGET) {
+    if ($CHOOSEDTARGET{$target} < 0) { next; }
+    $nboftargetok++;
 }

 if ($nboftargetok) {

-	# Update buildroot
-	#-----------------
-	if ( !$copyalreadydone ) {
-		print "Delete directory $BUILDROOT\n";
-		$ret = `rm -fr "$BUILDROOT"`;
-		mkdir "$BUILDROOT";
-		mkdir "$BUILDROOT/htdocs";
-		mkdir "$BUILDROOT/htdocs/langs";
-		mkdir "$BUILDROOT/htdocs/langs/$PROJECT";
+    # Update buildroot
+    #-----------------
+    if (! $copyalreadydone) {
+    	print "Delete directory $BUILDROOT\n";
+    	$ret=`rm -fr "$BUILDROOT"`;
+    	mkdir "$BUILDROOT";
+    	mkdir "$BUILDROOT/htdocs";
+    	mkdir "$BUILDROOT/htdocs/langs";
+    	mkdir "$BUILDROOT/htdocs/langs/$PROJECT";

-		print "Copy $SOURCE into $BUILDROOT\n";
-		mkdir "$BUILDROOT";
-		$ret =
-		  `cp -pr "$SOURCE/htdocs/langs/$PROJECT" "$BUILDROOT/htdocs/langs"`;
-	}
-	print "Clean $BUILDROOT\n";
-	$ret =
-`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/Thumbs.db`;
-	$ret =
-`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/*/CVS*`;
+    	print "Copy $SOURCE into $BUILDROOT\n";
+    	mkdir "$BUILDROOT";
+    	$ret=`cp -pr "$SOURCE/htdocs/langs/$PROJECT" "$BUILDROOT/htdocs/langs"`;
+    }
+    print "Clean $BUILDROOT\n";
+    $ret=`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/Thumbs.db`;
+    $ret=`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/*/CVS*`;
    
-	# Build package for each target
-	#------------------------------
-	foreach my $target ( keys %CHOOSEDTARGET ) 
-	{
-		if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
    
-		print "\nBuild package for target $target\n";
+    # Build package for each target
+    #------------------------------
+    foreach my $target (keys %CHOOSEDTARGET) {
+        if ($CHOOSEDTARGET{$target} < 0) { next; }
    
-		if ( $target eq 'TGZ' ) 
-		{
-			unlink $FILENAMETGZ . tgz;
-
-			#    		unlink $BUILDROOT/$FILENAMETGZ.tgz;
-			print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n";
-			$cmd =
-"tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" htdocs";
-			$ret = `$cmd`;
+        print "\nBuild package for target $target\n";
        
+    	if ($target eq 'TGZ') {
+    		unlink $FILENAMETGZ.tgz;
+#    		unlink $BUILDROOT/$FILENAMETGZ.tgz;
+    		print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n";
+   		    $cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" htdocs";
+   		    $ret=`$cmd`;
 #        	$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
 #        	$ret=`$cmd`;
-			if ( $OS =~ /windows/i ) {
-				print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
-				$ret = `mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+            if ($OS =~ /windows/i) {
+        		print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
+        		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+#        		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+            }
+    		next;
+    	}

-   #        		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
-			}
-			next;
-		}
+    	if ($target eq 'ZIP') {
+    		unlink $FILENAMEZIP.zip;
+    		print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+     		chdir("$BUILDROOT");
+            #print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+            #$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+    		$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+		print "Move $FILENAMEZIP.zip to $DESTI\n";
+    		rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
+    		next;
+    	}
    
-		if ( $target eq 'ZIP' ) 
-		{
-			unlink $FILENAMEZIP . zip;
-			print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
-			chdir("$BUILDROOT");
+    	if ($target eq 'RPM') {                 # Linux only
+    		$BUILDFIC="$FILENAME.spec";
+    		unlink $FILENAMETGZ.tgz;
+    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
+    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar.exclude" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;
+
+    		print "Move $FILENAMETGZ.tgz to $RPMDIR/SOURCES/$FILENAMETGZ.tgz\n";
+    		$cmd="mv \"$BUILDROOT/$FILENAMETGZ.tgz\" \"$RPMDIR/SOURCES/$FILENAMETGZ.tgz\"";
+            $ret=`$cmd`;
+
+    		print "Copy $SOURCE/make/rpm/${BUILDFIC} to $BUILDROOT\n";
+#    		$ret=`cp -p "$SOURCE/make/rpm/${BUILDFIC}" "$BUILDROOT"`;
+            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";
+            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+            while (<SPECFROM>) {
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
+            close SPECTO;
+    
+    		print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n";
+    		$ret=`rpm --clean -ba $BUILDROOT/${BUILDFIC}`;
+    	
+   		    print "Move $RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm into $DESTI/${FILENAMERPM}.noarch.rpm\n";
+   		    $cmd="mv \"$RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm\" \"$DESTI/${FILENAMERPM}.noarch.rpm\"";
+    		$ret=`$cmd`;
+    		next;
+    	}
+    	
+    	if ($target eq 'DEB') {
+            print "Automatic build for DEB is not yet supported.\n";
+        }
+        
+    	if ($target eq 'EXE') {
+    		unlink "$FILENAMEEXE.exe";
+    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
+    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
+            print "$command\n";
+    		$ret=`$command`;
+    		print "Move $FILENAMEEXE.exe to $DESTI\n";
+    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
+    		next;
+    	}
+    
+    }

-#print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
-#$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-			$ret =
-			  `7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-			print "Move $FILENAMEZIP.zip to $DESTI\n";
-			rename( "$BUILDROOT/$FILENAMEZIP.zip", "$DESTI/$FILENAMEZIP.zip" );
-			next;
-		}
-	}
 }

 print "\n----- Summary -----\n";
-foreach my $target ( keys %CHOOSEDTARGET ) {
-	if ( $CHOOSEDTARGET{$target} < 0 ) {
-		print "Package $target not built (bad requirement).\n";
-	}
-	else {
-		print "Package $target built succeessfully in $DESTI\n";
-	}
+foreach my $target (keys %CHOOSEDTARGET) {
+    if ($CHOOSEDTARGET{$target} < 0) {
+        print "Package $target not built (bad requirement).\n";
+    } else {
+        print "Package $target built succeessfully in $DESTI\n";
+    }
 }

-if ( !$btach ) {
-	print "\nPress key to finish...";
-	my $WAITKEY = <STDIN>;
+if (! $btach) {
+    print "\nPress key to finish...";
+    my $WAITKEY=<STDIN>;
 }

 0;
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -8,6 +8,7 @@

 use Cwd;

+$PROJECT="mymodule";

@LISTETARGET=("TGZ");   # Possible packages
 %REQUIREMENTTARGET=(    # Tool requirement for each package
@@ -92,7 +93,7 @@ if ($MINOR eq '')
 }

 # Ask module
-print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
+print "Enter name for your module (mymodule, mywonderfulmondule, ...) : ";
 $PROJECTINPUT=<STDIN>;
 chomp($PROJECTINPUT);
 print "Move to ".$DIR." directory.\n";
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -2,6 +2,7 @@
 #-----------------------------------------------------------------------------
 # \file         build/makepack-dolibarrtheme.pl
 # \brief        Script to build a theme Package for Dolibarr
+# \version      $Revision$
 # \author       (c)2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
 #-----------------------------------------------------------------------------

@@ -24,7 +25,7 @@ $PROJECT="dolibarr";


 use vars qw/ $REVISION $VERSION /;
-$REVISION='1.11';
+$REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";


@@ -74,14 +75,10 @@ my $copyalreadydone=0;
 my $batch=0;

 print "Makepack theme version $VERSION\n";
-print "Enter name of theme(s) to package (separated with space): ";
+print "Enter name of theme to package: ";
 $PROJECT=<STDIN>;
 chomp($PROJECT);
-
-@PROJECTLIST=split(/ /,$PROJECT);
-$PROJECT=join('',@PROJECTLIST);
-
-
+# TODO Autodetect version
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
@@ -97,8 +94,6 @@ if ($MINOR eq '')

 $FILENAME="$PROJECT";
 $FILENAMETGZ="theme_$PROJECT-$MAJOR.$MINOR";
-$FILENAMEZIP="theme_$PROJECT-$MAJOR.$MINOR";
-
 if (-d "/usr/src/redhat") {
    # redhat
    $RPMDIR="/usr/src/redhat";
@@ -114,7 +109,7 @@ $DESTI="$SOURCE/build";

 # Choose package targets
 #-----------------------
-$target="ZIP";    # Packages uses this format
+$target="TGZ";    # Les themes sont au format tgz
 if ($target) {
    $CHOOSEDTARGET{uc($target)}=1;
 }
@@ -207,13 +202,11 @@ if ($nboftargetok) {
    	mkdir "$BUILDROOT";
    	mkdir "$BUILDROOT/htdocs";
    	mkdir "$BUILDROOT/htdocs/theme";
+    	mkdir "$BUILDROOT/htdocs/theme/$PROJECT";

    	print "Copy $SOURCE into $BUILDROOT\n";
    	mkdir "$BUILDROOT";
-		foreach my $tmp (@PROJECTLIST)
-		{
-    		$ret=`cp -pr "$SOURCE/htdocs/theme/$tmp" "$BUILDROOT/htdocs/theme"`;
-		}
+    	$ret=`cp -pr "$SOURCE/htdocs/theme/$PROJECT" "$BUILDROOT/htdocs/theme"`;
    }
    print "Clean $BUILDROOT\n";
    $ret=`rm -fr $BUILDROOT/htdocs/theme/$PROJECT/Thumbs.db $BUILDROOT/htdocs/theme/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/theme/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/theme/$PROJECT/*/*/*/Thumbs.db`;
@@ -229,12 +222,16 @@ if ($nboftargetok) {
        
    	if ($target eq 'TGZ') {
    		unlink $FILENAMETGZ.tgz;
+#    		unlink $BUILDROOT/$FILENAMETGZ.tgz;
    		print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n";
   		    $cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" htdocs";
   		    $ret=`$cmd`;
+#        	$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
+#        	$ret=`$cmd`;
            if ($OS =~ /windows/i) {
        		print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
        		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+#        		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
            }
    		next;
    	}
@@ -243,9 +240,56 @@ if ($nboftargetok) {
    		unlink $FILENAMEZIP.zip;
    		print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
     		chdir("$BUILDROOT");
-    		$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip htdocs`;
-			print "Move $FILENAMEZIP.zip to $DESTI\n";
-    		$ret=`mv "$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
+            #print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+            #$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+    		$ret=`7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+		print "Move $FILENAMEZIP.zip to $DESTI\n";
+    		rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
+    		next;
+    	}
+    
+    	if ($target eq 'RPM') {                 # Linux only
+    		$BUILDFIC="$FILENAME.spec";
+    		unlink $FILENAMETGZ.tgz;
+    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
+    		$ret=`tar --exclude-vcs --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" --group=500 --owner=500 -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;
+
+    		print "Move $FILENAMETGZ.tgz to $RPMDIR/SOURCES/$FILENAMETGZ.tgz\n";
+    		$cmd="mv \"$BUILDROOT/$FILENAMETGZ.tgz\" \"$RPMDIR/SOURCES/$FILENAMETGZ.tgz\"";
+            $ret=`$cmd`;
+
+    		print "Copy $SOURCE/make/rpm/${BUILDFIC} to $BUILDROOT\n";
+#    		$ret=`cp -p "$SOURCE/make/rpm/${BUILDFIC}" "$BUILDROOT"`;
+            open (SPECFROM,"<$SOURCE/make/rpm/${BUILDFIC}") || die "Error";
+            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+            while (<SPECFROM>) {
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
+            close SPECTO;
+    
+    		print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n";
+    		$ret=`rpm --clean -ba $BUILDROOT/${BUILDFIC}`;
+    	
+   		    print "Move $RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm into $DESTI/${FILENAMERPM}.noarch.rpm\n";
+   		    $cmd="mv \"$RPMDIR/RPMS/noarch/${FILENAMERPM}.noarch.rpm\" \"$DESTI/${FILENAMERPM}.noarch.rpm\"";
+    		$ret=`$cmd`;
+    		next;
+    	}
+    	
+    	if ($target eq 'DEB') {
+            print "Automatic build for DEB is not yet supported.\n";
+        }
+        
+    	if ($target eq 'EXE') {
+    		unlink "$FILENAMEEXE.exe";
+    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
+    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
+            print "$command\n";
+    		$ret=`$command`;
+    		print "Move $FILENAMEEXE.exe to $DESTI\n";
+    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$DESTI/$FILENAMEEXE.exe");
    		next;
    	}
    
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -9,23 +9,25 @@ beta version of Dolibarr, step by step.

 - Check all files are commited.
 - Update version/info in / directory (README*.txt, ChangeLog...)
- Update version number with x.x.x   in build/doxygen/dolibarr-doxygen.doxyfile
- Update version number with x.x.x   in build/perl/virtualmin/dolibarr.pl
+- Update version number with x.x.x in build/doxygen/dolibarr-doxygen.doxyfile
+- Update version number with x.x.x in build/perl/virtualmin/dolibarr.pl
 - Update version number with x.x.x-y in build/makepack-dolibarr.pl
- Update version number with x.x.x-y in build/deb/changelog
 - Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.x.x-y in htdocs/filefunc.inc.php
 - Update version number with x.x.x-y in htdocs/install/inc.php
- Update version number with x.x.x-y in htdocs/support/inc.php
- Update version number with x.x.x-y in htdocs/build/rpm/*.spec
 - Commit all changes.
- Add a Tag (DOLIBARR_x_y_BETA)
- Create a branch (DOLIBARR_x_y_BRANCH).
+- Add a CVS Tag (DOLIBARR_x_y_BETA)
+- If it's a new branch (Vx.y), create a branch (DOLIBARR_x_y_BRANCH).

- Run makepack-dolibarr.pl to generate all packages.
- Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
+- Build Dolibarr and DoliWamp with makepack-dolibarr.pl
+- Check content of built packages.
+- Move build files (tgz+exe+deb), ChangeLog and PAD/DOAP files into the
+  Dolibarr web site repository /home/dolibarr/wwwroot/files.
+- Update and upload NLTechno web page with DoliWamp version.
+
+- Add/Update entries on joomla web site www.dolibarr.org with links
+  to files http://www.dolibarr.org/files/XXX.

- Post a news on dolibarr.org/dolibarr.fr
 - Send mail on mailings-list


@@ -39,19 +41,20 @@ complete release of Dolibarr, step by step.
 - Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.x.x-y in htdocs/filefunc.inc.php
 - Update version number with x.x.x-y in htdocs/install/inc.php
- Update version number with x.x.x-y in htdocs/support/inc.php
- Update version number with x.x.x-y in htdocs/build/rpm/*.spec
- Update PAD files.
+- Update PAD and DOAP files.
 - Commit all changes.
- Add a Tag (DOLIBARR_x_y)
+- Add a CVS Tag (DOLIBARR_x_y)

- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
+- Build Dolibarr and DoliWamp with makepack-dolibarr.pl
 - Check content of built packages.
- Move build files (tgz+exe+deb+rpm...), ChangeLog and PAD files
-  into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
+- Move build files (tgz+exe+deb), ChangeLog and PAD/DOAP files into the
+  Dolibarr web site repository /home/dolibarr/wwwroot/files.
 - Edit symbolic links in directory "/home/dolibarr/wwwroot/files" on server to
-  point to new files (used by PAD descriptor).
+  point to new files.
+- Update and upload NLTechno web page with DoliWamp version.
+
 - Upload files dolibarr.*.tgz and doliwamp.*.exe on sourceforge.
+- Add/Update entries on joomla web site www.dolibarr.org with new sourceforge link.

 - Send mail on mailings-list
 - Send news on OpenSource web sites (if major beta or release)
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,9 +4,9 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.1.0</Program_Version>
-		<Program_Release_Month>10</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
+		<Program_Version>3.0.0</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>16</Program_Release_Day>
 		<Program_Release_Year>2011</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
@@ -14,7 +14,7 @@
 		<Program_Type>Freeware</Program_Type>
 		<Program_Release_Status>Major Update</Program_Release_Status>
 		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
-		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP</Program_OS_Support>
 		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
 		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
 		<Program_Specific_Category>Business</Program_Specific_Category>
@@ -42,26 +42,16 @@
 			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
 			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows.

-
+
+
+Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...).
+
+
+
+It's an OpenSource project, based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 

-DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
-			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>


 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.
@@ -82,6 +72,11 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Download_URLs>
 			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
 		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
 		<EULA>GNU GPL</EULA>
 	</Permissions>
@@ -188,9 +183,4 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Affiliates_V-Share_Product_ID />
 		<Affiliates_V-Share_Maximum_Commission_Rate />
 		<Affiliates_VFree_Order_Page />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
 		<Affiliates_VFree_Vendor_ID />
--- a/build/pad/Dolibarr
+++ b/build/pad/Dolibarr
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <PADGEN_CML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<AppVerInfo>PADGen 3.0.1.38</AppVerInfo>
 	<Company_Info>
 		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
+		<Address_1>61 Boulevard Vauban</Address_1>
 		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
+		<City_Town>Montigny-le-Bretonneux</City_Town>
 		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Zip_Postal_Code>78180</Zip_Postal_Code>
 		<Country>FRANCE</Country>
 		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
 		<Contact_Info>
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,9 +4,9 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.1..0</Program_Version>
-		<Program_Release_Month>10</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
+		<Program_Version>3.0.0</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>16</Program_Release_Day>
 		<Program_Release_Year>2011</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
@@ -38,44 +38,28 @@
 	<Program_Descriptions>
 		<English>
 			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+			<Char_Desc_45>Dolibarr ERP/CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP/CRM, the easy to use open source software to manage your activity</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP/CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules).

-

-Simple to install

-
+
+
+
+
+It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+
+
+
+
+
+

    * Simple to install

-
-
-Simple to develop 
-
-
-
-Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
-
-
-
-Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
-
-
-
-Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
-


    * Simple to use
@@ -96,6 +80,11 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 	<Web_Info>
 		<Application_URLs>
 			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+		</Application_URLs>
 		<Download_URLs>
 			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
@@ -202,9 +191,4 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 		<Affiliates_Shareasale_Product_ID />
 		<Affiliates_Shareasale_Maximum_Commission_Rate />
 		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
 		<Affiliates_SWReg_Vendor_ID />
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" ?>
 <XML_DIZ_INFO>
 	<MASTER_PAD_VERSION_INFO>
 		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
@@ -7,11 +7,11 @@
 	</MASTER_PAD_VERSION_INFO>
 	<Company_Info>
 		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
+		<Address_1>61 Boulevard Vauban</Address_1>
 		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
+		<City_Town>Montigny-le-Bretonneux</City_Town>
 		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Zip_Postal_Code>78180</Zip_Postal_Code>
 		<Country>FRANCE</Country>
 		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
 		<Contact_Info>
@@ -34,9 +34,9 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.1..0</Program_Version>
-		<Program_Release_Month>10</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
+		<Program_Version>3.0.0</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>16</Program_Release_Day>
 		<Program_Release_Year>2011</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
@@ -68,44 +68,44 @@
 	<Program_Descriptions>
 		<English>
 			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+			<Char_Desc_45>Dolibarr ERP/CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP/CRM, the easy to use open source software to manage your activity</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP/CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+
+
+
+
+
+
+
+
+
+
+

-

-Simple to install

-

    * Simple to install

-
-
-Simple to develop 
-
-
-
-Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
-
-
-
-Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
-
-
-
-Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
-



@@ -126,6 +126,11 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant



+
+
+
+
+



@@ -232,9 +237,4 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 		<Affiliates_Regnet_Product_ID />
 		<Affiliates_Regnet_Maximum_Commission_Rate />
 		<Affiliates_Regnow_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
 		<Affiliates_Regnow_Vendor_ID />
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" ?>
 <XML_DIZ_INFO>
 	<MASTER_PAD_VERSION_INFO>
 		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
@@ -34,9 +34,9 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.1.0</Program_Version>
-		<Program_Release_Month>10</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
+		<Program_Version>3.0.0</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Release_Day>16</Program_Release_Day>
 		<Program_Release_Year>2011</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
@@ -44,7 +44,7 @@
 		<Program_Type>Freeware</Program_Type>
 		<Program_Release_Status>Major Update</Program_Release_Status>
 		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
-		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP</Program_OS_Support>
 		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
 		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
 		<Program_Specific_Category>Business</Program_Specific_Category>
@@ -72,28 +72,16 @@
 			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
 			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows.

+

+Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...).

-
+
+
+It's an OpenSource project, based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 

-
-
-DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
-			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>


 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.
@@ -114,6 +102,11 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Download_URLs>
 			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
 		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
 		<EULA>GNU GPL</EULA>
 	</Permissions>
@@ -220,9 +213,4 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Affiliates_V-Share_Product_ID />
 		<Affiliates_V-Share_Maximum_Commission_Rate />
 		<Affiliates_VFree_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
 		<Affiliates_VFree_Vendor_ID />
--- a/build/patch/buildpatch.ksh
+++ b/build/patch/buildpatch.ksh
@@ -1,9 +1,9 @@
 #/bin/ksh
 #----------------------------------------------------------------------------
-# \file         build/patch/buildpatch.sh
+# \file         build/patch/buildpatch.ksh
 # \brief        Create patch files
 # \version      $Revision$
-# \author       (c)2009-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2009 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 # This script can be used to build a patch after a developer has made
 # changes on files in its Dolibarr tree.
@@ -11,12 +11,13 @@
 # with explanation on its goal, for inclusion in main branch.
 #----------------------------------------------------------------------------

+# Put here full path of original and new dolibarr directories
+# Example: olddir=/mydirA1/mydirA2/dolibarrold
+# Example: newdir=/mydirB1/mydirB2/dolibarr
+export olddir=original_dir
+export newdir=modified_dir
+
 echo ----- Building patch file mypatch.patch -----
-if [ -z "$1" ] || [ -z "$2" ];
-then 
-    echo Usage:   buildpatch.sh  original_dir_path    modified_dir_path
-    echo Example: buildpatch.sh  /mydirA/dolibarrold  /mydirB/dolibarrnew
-else
-    echo Build patch between \"$1\" and \"$2\" 
-    diff -BNaur --exclude=CVS --exclude="*.patch" --exclude=".#*" --exclude="*~" --exclude="*.rej" --exclude="*.orig" --exclude="*.bak" --exclude=conf.php --exclude=documents  $1  $2  > mypatch.patch
-fi
+echo Build patch between \"$olddir\" and \"$newdir\" 
+diff -BNaur --exclude=CVS --exclude="*.patch" --exclude=".#*" --exclude="*~" --exclude="*.rej" --exclude="*.orig" --exclude="*.bak" --exclude=conf.php --exclude=documents  $olddir  $newdir  > mypatch.patch
+
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,8 +1,8 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \version      $Revision: 1.20 $
-# \author       (c)2009-2011 Regis Houssin  <regis@dolibarr.fr>
+# \version      $Revision$
+# \author       (c)2009-2010 Regis Houssin  <regis@dolibarr.fr>
 #----------------------------------------------------------------------------


@@ -31,7 +31,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.1.1" );
+return ( "3.0.0", "2.9.0", "2.8.1" );
 }

 sub script_dolibarr_category
@@ -87,7 +87,7 @@ else {
 	$rv .= &ui_table_row("Install sub-directory under <tt>$hdir</tt>",
 			     &ui_opt_textbox("dir", "dolibarr", 30,
 					     "At top level"));
-	if ($d->{'ssl'} && $ver >= 3.0) {
+	if ($d->{'ssl'} && $ver >= 2.9) {
 		$rv .= &ui_table_row("Force https connection?",
 				     &ui_yesno_radio("forcehttps", 0));
 		}
@@ -180,11 +180,9 @@ $err && return (0, "Failed to extract source : $err");
 # Add config file
 local $cfiledir = "$opts->{'dir'}/conf/";
 local $docdir = "$opts->{'dir'}/documents";
-local $altdir = "$opts->{'dir'}/custom";
 local $cfile = $cfiledir."conf.php";
 local $oldcfile = &transname();
 local $olddocdir = &transname();
-local $oldaltdir = &transname();
 local $url;

 $tmpl = &get_template($d->{'template'});
@@ -206,27 +204,23 @@ if ($opts->{'path'} =~ /\w/) {
 }

 if (!$upgrade) {
-	local $cdef = "$opts->{'dir'}/conf/conf.php.example";
-    &run_as_domain_user($d, "cp ".quotemeta($cdef)." ".quotemeta($cfile));
+        local $cdef = "$opts->{'dir'}/conf/conf.php.example";
+        &run_as_domain_user($d, "cp ".quotemeta($cdef)." ".quotemeta($cfile));
 	&set_ownership_permissions(undef, undef, 0777, $cfiledir);
 	&set_ownership_permissions(undef, undef, 0666, $cfile);
 	&run_as_domain_user($d, "mkdir ".quotemeta($docdir));
 	&set_ownership_permissions(undef, undef, 0777, $docdir);
-	&run_as_domain_user($d, "mkdir ".quotemeta($altdir));
-	&set_ownership_permissions(undef, undef, 0777, $altdir);
-}
+        }
 else {
-	# Preserve old config file, documents and custom directory
+	# Preserve old config file and documents directory
 	&copy_source_dest($cfile, $oldcfile);
 	&copy_source_dest($docdir, $olddocdir);
-	&copy_source_dest($altdir, $oldaltdir);
-}
+	}

 if ($upgrade) {
-	# Put back original config file, documents and custom directory
+	# Put back original config file and documents directory
 	&copy_source_dest_as_domain_user($d, $oldcfile, $cfile);
 	&copy_source_dest_as_domain_user($d, $olddocdir, $docdir);
-	&copy_source_dest_as_domain_user($d, $oldaltdir, $altdir);
 	
 	# First page (Update database schema)
 	local @params = ( [ "action", "upgrade" ],
@@ -272,8 +266,6 @@ else {
 			  [ "main_force_https", $opts->{'forcehttps'} ],
 			  [ "dolibarr_main_db_character_set", $charset ],
 			  [ "dolibarr_main_db_collation", $collate ],
-			  [ "usealternaterootdir", "1" ],
-			  [ "main_alt_dir_name", "custom" ],
 			 );
 	local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
@@ -354,9 +346,9 @@ return (1, "Dolibarr directory and tables deleted.");
 sub script_dolibarr_latest
 {
 local ($ver) = @_;
-if ($ver >= 3.0) {
+if ($ver >= 2.9) {
 	return ( "http://www.dolibarr.fr/files/stable/",
-		 "dolibarr\\-(3\\.[0-9\\.]+)" );
+		 "dolibarr\\-(2\\.[0-9\\.]+)" );
 	}
 return ( );
 }
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -5,53 +5,4 @@ RPM Package tools

 This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
-with format RPM (for Redhat, OpenSuse, Mandriva, ...).
-
-
-# This is standard command to work on RPM packaging:
-#
-# To install all packagers tools:
-# yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
-#
-# rpmlint file.rpm				    Test a package
-# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
-#
-# On Fedora
-# rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
-# yum install dolibarr-...rpm       To install package and dependencies   
-# yum erase dolibarr                To remove package
-# chcon -R -h -t httpd_sys_script_rw_t /file					To add temporary context rw for httpd on /file    
-# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" 	To add persistent context rw for httpd on /dir (this add file_contexts.local)
-# restorecon -R -v /file			Restore values into files (cancel chcon, validate semanage)    
-#
-# On OpenSuse
-# yast --install dolibarr-...rpm    To install package and dependencies
-# yast --remove  dolibarr           To remove package
-#
-# On Mageia (after su - root)
-# urpmi dolibarr-...rpm             To install package and dependencies
-# urpme dolibarr                    To remove package
-#
-# 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):
-SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.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
-Relationship Management (CRM) but also for different other activities.
-I am author of other already packaged OpenSources packages (awstats) but this
-is my first package to maintain myself. So i'm seeking a sponsor.
- Edit field "Block" and add FE-NEEDSPONSOR
- Check bug is into database by searching with id on https://bugzilla.redhat.com/
- Install fedora packager tools: yum install fedora-packager
- Setup fedora packagers tools: fedora-packager-setup
- Send your package: koji build --scratch f16 path_to_source_RPM
- Check if package is available: http://koji.fedoraproject.org/koji/  
+with format RPM (for Redhat, Mandriva, ...).
--- a/build/rpm/conf.php
+++ b/build/rpm/conf.php
@@ -1,8 +0,0 @@
-<?php
-#
-# Take a look at conf.php.example file for an example of conf.php file
-# and explanations for all possibles parameters.
-#
-# This file will be filled by installer
-#
-?>
--- a/build/rpm/dolibarr-forrpm.patch
+++ b/build/rpm/dolibarr-forrpm.patch
@@ -1,42 +0,0 @@
-diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
--- htdocs/filefunc.inc.php.patch	2011-09-03 02:32:48.666952000 +0200
-+++ htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -65,8 +65,8 @@ $conffiletoshowshort = "conf.php";
- $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
-diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
--- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
-+++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -75,8 +75,8 @@ $conffiletoshowshort = "conf.php";
- $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))
-diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
--- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
-+++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
- $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))
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -1,27 +0,0 @@
-[Desktop Entry]
-# 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[es]=Dolibarr ERP & CRM
-Name[fr]=Dolibarr ERP & CRM
-Name[it]=Dolibarr ERP & CRM
-GenericName=Dolibarr ERP & CRM
-Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
-Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs
-Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
-# Command to open an URL
-# For Fedora: xdg-open 
-# 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
-Terminal=false
-Type=Application
-Categories=Office;
-StartupNotify=true
-InitialPreference=5
-#NoDisplay=true
-#OnlyShowIn=GNOME
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -0,0 +1,121 @@
+%define name dolibarr
+%define version	__VERSION__
+# For Mandrake
+#%define release 1mdk
+# For all other distrib
+%define release 1
+
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Summary: Dolibarr
+
+License: GPL
+Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
+Vendor: Dolibarr dev team
+
+URL: http://%{name}.com
+Source: http://dl.sf.net/dolibarr/%{name}-%{version}.tgz
+BuildArch: noarch
+BuildArchitectures: noarch
+BuildRoot: /tmp/%{name}-buildroot
+#Icon: dolibarr_logo1.gif
+
+# For Mandrake
+Group: Networking/WWW
+# For all other distrib
+Group: Applications/Internet
+
+#Requires=perl
+AutoReqProv: yes
+
+
+%description
+Dolibarr
+
+%description -l fr
+Dolibarr est un logiciel de gestion de PME/PMI, artisans ou 
+associations.
+
+
+#---- prep
+%prep
+%setup -q
+
+
+#---- build
+%build
+# Nothing to build
+
+
+#---- install
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT/usr/local/dolibarr/doc
+mkdir -p $RPM_BUILD_ROOT/usr/local/dolibarr/htdocs
+mkdir -p $RPM_BUILD_ROOT/usr/local/dolibarr/misc
+mkdir -p $RPM_BUILD_ROOT/usr/local/dolibarr/mysql
+mkdir -p $RPM_BUILD_ROOT/usr/local/dolibarr/pgsl
+mkdir -p $RPM_BUILD_ROOT/usr/local/dolibarr/scripts
+#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr
+#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
+
+install -m 444 README  $RPM_BUILD_ROOT/usr/local/dolibarr/README
+install -m 444 COPYRIGHT  $RPM_BUILD_ROOT/usr/local/dolibarr/COPYRIGHT
+cp -pr doc $RPM_BUILD_ROOT/usr/local/dolibarr
+cp -pr htdocs $RPM_BUILD_ROOT/usr/local/dolibarr
+cp -pr misc $RPM_BUILD_ROOT/usr/local/dolibarr
+cp -pr mysql $RPM_BUILD_ROOT/usr/local/dolibarr
+cp -pr pgsql $RPM_BUILD_ROOT/usr/local/dolibarr
+cp -pr scripts $RPM_BUILD_ROOT/usr/local/dolibarr
+
+
+#---- clean
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+#---- files
+%files
+%defattr(-,root,root)
+%doc README
+%doc COPYRIGHT
+%doc /usr/local/dolibarr/doc/*
+#%config /usr/local/dolibarr/htdocs/conf/conf.php
+%dir /usr/local/dolibarr/htdocs
+%dir /usr/local/dolibarr/misc
+%dir /usr/local/dolibarr/mysql
+%dir /usr/local/dolibarr/pgsql
+%dir /usr/local/dolibarr/scripts
+
+/usr/local/dolibarr/doc/*
+/usr/local/dolibarr/htdocs/*
+/usr/local/dolibarr/misc/*
+/usr/local/dolibarr/mysql/*
+/usr/local/dolibarr/pgsql/*
+/usr/local/dolibarr/scripts/*
+
+
+#---- post
+%post
+
+# Create a config file
+#if [ 1 -eq 1 ]; then
+#  if [ ! -f /%{_sysconfdir}/dolibarr/dolibarr.`hostname`.conf ]; then
+#    /bin/cat /%{_sysconfdir}/dolibarr/dolibarr.model.conf | \
+#      /usr/bin/perl -p -e 's|^SiteDomain=.*$|SiteDomain="'`hostname`'"|;
+#                       s|^HostAliases=.*$|HostAliases="REGEX[^.*'${HOSTNAME//./\\\\.}'\$]"|;
+#                      ' > /%{_sysconfdir}/dolibarr/dolibarr.`hostname`.conf || :
+#  fi
+#fi
+
+# Show result
+echo
+echo ----- dolibarr %version - Dolibarr dev team -----
+echo dolibarr files have been installed in /usr/local/dolibarr
+echo
+
+
+%changelog
+
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -1,236 +0,0 @@
-#---------------------------------------------------------
-# Spec file to build a rpm file
-#
-# This is an example to build a rpm file. You can use this 
-# file to build a package for your own distributions and 
-# edit it if you need to match your rules.
-# --------------------------------------------------------
-
-Name: dolibarr
-Version: __VERSION__
-Release: __RELEASE__%{?dist}
-Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
-Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
-Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
-
-License: GPLv2+
-#Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
-Vendor: Dolibarr dev team
-
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Group: Applications/Productivity
-Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql dejavu-sans-fonts
-#BuildRequires: desktop-file-utils
-
-# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
-AutoReqProv: no
-
-
-%description
-An easy to use CRM & ERP open source/free software for small  
-and medium companies, foundations or freelances. It includes different 
-features for Enterprise Resource Planning (ERP) and Customer Relationship 
-Management (CRM) but also for different other activities.
-Dolibarr was designed to provide only features you need and be easy to 
-use.
-
-%description -l es
-Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
-o autónomos. Incluye diferentes funcionalidades para la Planificación 
-de Recursos Empresariales (ERP) y Gestión de la Relación con los
-Clientes (CRM) así como para para otras diferentes actividades. 
-Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
-que necesita y haciendo hincapié en su facilidad de uso.
-    
-%description -l fr
-Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
-artisans ou associations. Il permet de gérer vos clients, prospect, 
-fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings
-et bien d'autres choses dans une interface pensée pour la simplicité.
-
-%description -l it
-Un programmo gestionale per piccole e medie
-imprese, fondazioni e liberi professionisti. Include varie funzionalità per
-Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
-attività. Progettato per poter fornire solo ciò di cui hai bisogno 
-ed essere facile da usare.
-Programmo web, progettato per poter fornire solo ciò di 
-cui hai bisogno ed essere facile da usare.
-
-
-
-#---- prep
-%prep
-%setup -q
-%patch0 -p0 -b .patch
-
-
-
-#---- build
-%build
-# Nothing to build
-
-
-
-#---- install
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
-%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
-%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
-
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-
-
-#---- clean
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-
-
-#---- files
-%files
-
-%defattr(0755, root, root, 0755)
-%dir %_datadir/dolibarr/scripts
-%_datadir/dolibarr/scripts/*
-
-%defattr(-, root, root, 0755)
-%doc COPYING ChangeLog doc/index.html
-%dir %_datadir/dolibarr/build/rpm
-%dir %_datadir/dolibarr/build/tgz
-%dir %_datadir/dolibarr/htdocs
-%_datadir/pixmaps/dolibarr.png
-%_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/rpm/*
-%_datadir/dolibarr/build/tgz/*
-%_datadir/dolibarr/htdocs/*
-
-%defattr(0664, -, -)
-%config(noreplace) %{_sysconfdir}/dolibarr/conf.php
-%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
-%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
-%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
-
-
-
-#---- post (after unzip during install)
-%post
-
-# Define vars
-export docdir="/var/lib/dolibarr/documents"
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-export apacheuser='apache';
-export apachegroup='apache';
-
-# Remove dolibarr install/upgrade lock file if it exists
-%{__rm} -f $docdir/install.lock
-
-# Create empty directory for uploaded files and generated documents 
-echo Create document directory $docdir
-%{__mkdir} -p $docdir
-
-# Set correct owner on config files
-%{__chown} -R root:$apachegroup /etc/dolibarr/*
-
-# Create config for se $seconfig
-echo Add SE Linux permissions for dolibarr
-# semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
-#semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)"
-semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
-restorecon -R -v /etc/dolibarr
-#restorecon -R -v /usr/share/dolibarr
-restorecon -R -v /var/lib/dolibarr
-
-# Create a config link dolibarr.conf
-if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-fi
-
-echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
-%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr
-%{__chmod} -R o-w /var/lib/dolibarr
-
-# Restart web server
-echo Restart web server
-if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
-fi
-if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
-fi
-
-# Restart mysql
-echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
-fi
-
-# Show result
-echo
-echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
-echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
-echo "To finish installation and use Dolibarr, click on the menu" 
-echo "entry Dolibarr ERP-CRM or call the following page from your"
-echo "web browser:"  
-echo "http://localhost/dolibarr/"
-echo "-------------------------------------------------------"
-echo
-
-
-#---- postun (after uninstall)
-%postun
-
-# Define vars
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
-then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
-
-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
-fi
-
-
-
-%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326)
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -1,316 +0,0 @@
-#---------------------------------------------------------
-# Spec file to build a rpm file
-#
-# This is an example to build a rpm file. You can use this 
-# file to build a package for your own distributions and 
-# edit it if you need to match your rules.
-# --------------------------------------------------------
-
-Name: dolibarr
-Version: __VERSION__
-Release: __RELEASE__
-Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
-Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
-Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
-
-License: GPLv2+
-#Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
-Vendor: Dolibarr dev team
-
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Group: Applications/Productivity
-Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap 
-Requires: php-mysql >= 4.1.0 
-
-# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
-AutoReqProv: no
-
-
-%description
-An easy to use CRM & ERP open source/free software for small  
-and medium companies, foundations or freelances. It includes different 
-features for Enterprise Resource Planning (ERP) and Customer Relationship 
-Management (CRM) but also for different other activities.
-Dolibarr was designed to provide only features you need and be easy to 
-use.
-
-%description -l es
-Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
-o autónomos. Incluye diferentes funcionalidades para la Planificación 
-de Recursos Empresariales (ERP) y Gestión de la Relación con los
-Clientes (CRM) así como para para otras diferentes actividades. 
-Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
-que necesita y haciendo hincapié en su facilidad de uso.
-    
-%description -l fr
-Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
-artisans ou associations. Il permet de gérer vos clients, prospect, 
-fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings
-et bien d'autres choses dans une interface pensée pour la simplicité.
-
-%description -l it
-Un programmo gestionale per piccole e medie
-imprese, fondazioni e liberi professionisti. Include varie funzionalità per
-Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
-attività. Progettato per poter fornire solo ciò di cui hai bisogno 
-ed essere facile da usare.
-Programmo web, progettato per poter fornire solo ciò di 
-cui hai bisogno ed essere facile da usare.
-
-
-
-#---- prep
-%prep
-%setup -q
-%patch0 -p0 -b .patch
-
-
-#---- build
-%build
-# Nothing to build
-
-
-
-#---- install
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
-%{__install} -m 644 build/rpm/install.forced.php.generic $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
-%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
-
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-
-
-#---- clean
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-
-
-#---- files
-%files
-
-%defattr(0755, root, root, 0755)
-%dir %_datadir/dolibarr/scripts
-%_datadir/dolibarr/scripts/*
-
-%defattr(-, root, root, 0755)
-%doc COPYING ChangeLog doc/index.html
-%dir %_datadir/dolibarr/build/rpm
-%dir %_datadir/dolibarr/build/tgz
-%dir %_datadir/dolibarr/htdocs
-%_datadir/pixmaps/dolibarr.png
-%_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/rpm/*
-%_datadir/dolibarr/build/tgz/*
-%_datadir/dolibarr/htdocs/*
-
-%defattr(0664, -, -)
-%config(noreplace) %{_sysconfdir}/dolibarr/conf.php
-%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
-%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
-%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
-
-#lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA
-#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES
-#lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK
-#lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT
-#lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE
-#lang(el_GR) %_datadir/dolibarr/htdocs/langs/el_GR
-#lang(en_AU) %_datadir/dolibarr/htdocs/langs/el_AU
-#lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB
-#lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN
-#lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ
-#lang(en)    %_datadir/dolibarr/htdocs/langs/en_US
-#lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR
-#lang(es)    %_datadir/dolibarr/htdocs/langs/es_ES
-#lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN
-#lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX
-#lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR
-#lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR
-#lang(fi)    %_datadir/dolibarr/htdocs/langs/fi_FI
-#lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE
-#lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA
-#lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH
-#lang(fr)    %_datadir/dolibarr/htdocs/langs/fr_FR
-
-
-
-#---- post (after unzip during install)
-%post
-
-# Define vars
-export docdir="/var/lib/dolibarr/documents"
-export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
-
-# Detect OS
-os='unknown';
-if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-    export os='opensuse';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='wwwrun';
-    export apachegroup='www';
-fi
-if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='www-data';
-    export apachegroup='www-data';
-fi
-echo OS detected: $os
-
-# Remove dolibarr install/upgrade lock file if it exists
-%{__rm} -f $docdir/install.lock
-
-# Create empty directory for uploaded files and generated documents 
-echo Create document directory $docdir
-%{__mkdir} -p $docdir
-
-# Create install.forced.php into Dolibarr install directory
-if [ "x$os" = "xubuntu-debian" ]
-then
-	superuserlogin=''
-	superuserpassword=''
-	if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
-	    # Load superuser login and pass
-	    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
-	    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
-	fi
-	echo Mysql superuser found to use is $superuserlogin
-	%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
-	%{__chmod} -R 660 $installconfig
-fi
-
-# Set correct owner on config files
-%{__chown} -R root:$apachegroup /etc/dolibarr/*
-
-# Create config for se $seconfig
-if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
-    echo Add SE Linux permissions for dolibarr
-    # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-    semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
-    semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
-    restorecon -R -v /etc/dolibarr
-    restorecon -R -v /var/lib/dolibarr
-fi
-
-# Create a config link dolibarr.conf
-if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-fi
-
-echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
-%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr
-%{__chmod} -R o-w /var/lib/dolibarr
-
-# Restart web server
-echo Restart web server
-if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
-fi
-if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
-fi
-
-# Restart mysql
-echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
-fi
-
-# Show result
-echo
-echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
-echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
-echo "To finish installation and use Dolibarr, click on the menu" 
-echo "entry Dolibarr ERP-CRM or call the following page from your"
-echo "web browser:"  
-echo "http://localhost/dolibarr/"
-echo "-------------------------------------------------------"
-echo
-
-
-
-#---- postun (after uninstall)
-%postun
-
-# Detect OS
-os='unknown';
-if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-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"
-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"
-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"
-fi
-
-# Remove apache link
-if [ -L $apachelink ] ;
-then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
-
-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
-fi
-
-
-
-%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326)
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -1,225 +0,0 @@
-#---------------------------------------------------------
-# Spec file to build a rpm file
-#
-# This is an example to build a rpm file. You can use this 
-# file to build a package for your own distributions and 
-# edit it if you need to match your rules.
-# --------------------------------------------------------
-
-Name: dolibarr
-Version: __VERSION__
-Release: __RELEASE__
-Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
-Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
-Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
-
-License: GPLv2+
-#Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
-Vendor: Dolibarr dev team
-
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Group: Applications/Productivity
-Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl fonts-ttf-dejavu 
-
-# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
-AutoReqProv: no
-
-
-%description
-An easy to use CRM & ERP open source/free software for small  
-and medium companies, foundations or freelances. It includes different 
-features for Enterprise Resource Planning (ERP) and Customer Relationship 
-Management (CRM) but also for different other activities.
-Dolibarr was designed to provide only features you need and be easy to 
-use.
-
-%description -l es
-Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
-o autónomos. Incluye diferentes funcionalidades para la Planificación 
-de Recursos Empresariales (ERP) y Gestión de la Relación con los
-Clientes (CRM) así como para para otras diferentes actividades. 
-Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
-que necesita y haciendo hincapié en su facilidad de uso.
-    
-%description -l fr
-Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
-artisans ou associations. Il permet de gérer vos clients, prospect, 
-fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings
-et bien d'autres choses dans une interface pensée pour la simplicité.
-
-%description -l it
-Un programmo gestionale per piccole e medie
-imprese, fondazioni e liberi professionisti. Include varie funzionalità per
-Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
-attività. Progettato per poter fornire solo ciò di cui hai bisogno 
-ed essere facile da usare.
-Programmo web, progettato per poter fornire solo ciò di 
-cui hai bisogno ed essere facile da usare.
-
-
-
-#---- prep
-%prep
-%setup -q
-%patch0 -p0 -b .patch
-
-
-
-#---- build
-%build
-# Nothing to build
-
-
-
-#---- install
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
-%{__install} -m 644 build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
-%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
-
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-
-
-#---- clean
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-
-
-#---- files
-%files
-
-%defattr(0755, root, root, 0755)
-%dir %_datadir/dolibarr/scripts
-%_datadir/dolibarr/scripts/*
-
-%defattr(-, root, root, 0755)
-%doc COPYING ChangeLog doc/index.html
-%dir %_datadir/dolibarr/build/rpm
-%dir %_datadir/dolibarr/build/tgz
-%dir %_datadir/dolibarr/htdocs
-%_datadir/pixmaps/dolibarr.png
-%_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/rpm/*
-%_datadir/dolibarr/build/tgz/*
-%_datadir/dolibarr/htdocs/*
-
-%defattr(0664, -, -)
-%config(noreplace) %{_sysconfdir}/dolibarr/conf.php
-%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
-%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
-%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
-
-
-
-#---- post (after unzip during install)
-%post
-
-# Define vars
-export docdir="/var/lib/dolibarr/documents"
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-export apacheuser='apache';
-export apachegroup='apache';
-
-# Remove dolibarr install/upgrade lock file if it exists
-%{__rm} -f $docdir/install.lock
-
-# Create empty directory for uploaded files and generated documents 
-echo Create document directory $docdir
-%{__mkdir} -p $docdir
-
-# Set correct owner on config files
-%{__chown} -R root:$apachegroup /etc/dolibarr/*
-
-# Create a config link dolibarr.conf
-if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-fi
-
-echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
-%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr
-%{__chmod} -R o-w /var/lib/dolibarr
-
-# Restart web server
-echo Restart web server
-if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
-fi
-if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
-fi
-
-# Restart mysql
-echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
-fi
-
-# Show result
-echo
-echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
-echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
-echo "To finish installation and use Dolibarr, click on the menu" 
-echo "entry Dolibarr ERP-CRM or call the following page from your"
-echo "web browser:"  
-echo "http://localhost/dolibarr/"
-echo "-------------------------------------------------------"
-echo
-
-
-#---- postun (after uninstall)
-%postun
-
-# Define vars
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
-then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
-
-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
-fi
-
-
-
-%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326)
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -1,230 +0,0 @@
-#---------------------------------------------------------
-# Spec file to build a rpm file
-#
-# This is an example to build a rpm file. You can use this 
-# file to build a package for your own distributions and 
-# edit it if you need to match your rules.
-# --------------------------------------------------------
-
-Name: dolibarr
-Version: __VERSION__
-Release: __RELEASE__
-Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
-Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
-Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
-
-License: GPLv2+
-#Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
-Vendor: Dolibarr dev team
-
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
-Patch0: %{name}-forrpm.patch
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Group: Productivity/Office/Management
-Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl fonts-ttf-dejavu 
-#BuildRequires: update-desktop-files fdupes
-
-# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
-AutoReqProv: no
-
-
-%description
-An easy to use CRM & ERP open source/free software for small  
-and medium companies, foundations or freelances. It includes different 
-features for Enterprise Resource Planning (ERP) and Customer Relationship 
-Management (CRM) but also for different other activities.
-Dolibarr was designed to provide only features you need and be easy to 
-use.
-
-%description -l es
-Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
-o autónomos. Incluye diferentes funcionalidades para la Planificación 
-de Recursos Empresariales (ERP) y Gestión de la Relación con los
-Clientes (CRM) así como para para otras diferentes actividades. 
-Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
-que necesita y haciendo hincapié en su facilidad de uso.
-    
-%description -l fr
-Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
-artisans ou associations. Il permet de gérer vos clients, prospect, 
-fournisseurs, devis, factures, comptes bancaires, agenda, campagnes mailings
-et bien d'autres choses dans une interface pensée pour la simplicité.
-
-%description -l it
-Un programmo gestionale per piccole e medie
-imprese, fondazioni e liberi professionisti. Include varie funzionalità per
-Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
-attività. Progettato per poter fornire solo ciò di cui hai bisogno 
-ed essere facile da usare.
-Programmo web, progettato per poter fornire solo ciò di 
-cui hai bisogno ed essere facile da usare.
-
-
-
-#---- prep
-%prep
-%setup -q
-%patch0 -p0 -b .patch
-
-
-#---- build
-%build
-# Nothing to build
-
-
-#---- install
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
-%{__install} -m 644 build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
-%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
-
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
-%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
-%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-
-# Enable this command to tag desktop file for suse
-#%suse_update_desktop_file dolibarr
-
-# Enable this command to allow suse detection of duplicate files and create hardlinks instead
-#%fdupes $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
-
-
-#---- clean
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-
-
-#---- files
-%files
-
-%defattr(0755, root, root, 0755)
-%dir %_datadir/dolibarr/scripts
-%_datadir/dolibarr/scripts/*
-
-%defattr(-, root, root, 0755)
-%doc COPYING ChangeLog doc/index.html
-%dir %_datadir/dolibarr/build/rpm
-%dir %_datadir/dolibarr/build/tgz
-%dir %_datadir/dolibarr/htdocs
-%_datadir/pixmaps/dolibarr.png
-%_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/rpm/*
-%_datadir/dolibarr/build/tgz/*
-%_datadir/dolibarr/htdocs/*
-
-%defattr(0664, -, -)
-%config(noreplace) %{_sysconfdir}/dolibarr/conf.php
-%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
-%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
-%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
-
-
-
-#---- post (after unzip during install)
-%post
-
-# Define vars
-export docdir="/var/lib/dolibarr/documents"
-export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-export apacheuser='wwwrun';
-export apachegroup='www';
-
-# Remove dolibarr install/upgrade lock file if it exists
-%{__rm} -f $docdir/install.lock
-
-# Create empty directory for uploaded files and generated documents 
-echo Create document directory $docdir
-%{__mkdir} -p $docdir
-
-# Set correct owner on config files
-%{__chown} -R root:$apachegroup /etc/dolibarr/*
-
-# Create a config link dolibarr.conf
-if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-fi
-
-echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
-%{__chown} -R $apacheuser:$apachegroup /var/lib/dolibarr
-%{__chmod} -R o-w /var/lib/dolibarr
-
-# Restart web server
-echo Restart web server
-if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
-fi
-if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
-fi
-
-# Restart mysql
-echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
-fi
-
-# Show result
-echo
-echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
-echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
-echo "To finish installation and use Dolibarr, click on the menu" 
-echo "entry Dolibarr ERP-CRM or call the following page from your"
-echo "web browser:"  
-echo "http://localhost/dolibarr/"
-echo "-------------------------------------------------------"
-echo
-
-
-#---- postun (after uninstall)
-%postun
-
-# Define vars
-export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
-then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
-
-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
-fi
-
-
-
-%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326)
--- a/build/rpm/file_contexts.dolibarr
+++ b/build/rpm/file_contexts.dolibarr
@@ -1,5 +0,0 @@
-# This file is useless.
-# It is provided as example to know contexts modified by installer
-# to make Dolibarr working.
-/etc/dolibarr(/.*?)     	system_u:object_r:httpd_sys_script_rw_t:s0
-/var/lib/dolibarr(/.*?)  	system_u:object_r:httpd_sys_script_rw_t:s0
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`
				`@@ -0,0 +1 @@`
				`usr/share/dolibarr/htdocs/conf/conf.php.example`