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
4171 changed files with 527422 additions and 200501 deletions
--- a/.project
+++ b/.project
@@ -5,21 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.mylyn.wikitext.ui.wikiTextValidationBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.dltk.core.scriptbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
@@ -28,6 +18,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.php.core.PHPNature</nature>
-		<nature>org.eclipse.mylyn.wikitext.ui.wikiTextNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,5 @@
-#Thu Aug 13 19:26:05 CEST 2009
+#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.validation.prefs
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -1,6 +1,13 @@
-#Thu Jul 17 02:14:17 CEST 2008
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.html.internal.validation.HTMLValidator\:org.eclipse.php.core.phpsource;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.1.102.v200709122200
+#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/31
+++ b/31
@@ -2,7 +2,9 @@
 License
 -------

-Dolibarr is distributed under GPL terms 2.0 (See COPYING file)
+Dolibarr is released 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

 However it uses some external libraries under different licences. This is compatibility summary:

@@ -11,26 +13,28 @@ 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
-Php-barcode       0.3pl1   GPL 2.0                     Yes              Bar code generation
+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.4    LGPL 2.1 or Mozilla PL 1.0  Yes              Editor WYSIWYG
-FPDF              1.53     Public domain               Yes              PDF generation (original code is modified)
-FPDF_TPL          1.1.2    Apache Software License 2.0 No GPL3 only     PDF templates management
-FPDI              1.2.1    Apache Software License 2.0 No GPL3 only     PDF templates management
-FPDI_Protection   1.0.2    Apache Software License 2.0 No GPL3 only     PDF encryption (8 files)
+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
-iWebkit			  4.6.2	   LGPL 3.0					   Yes				Iphone templates framework
+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.7.3    LGPL 2.1                    Yes              Interfaces with third tools
-OdtPHP            1.0.1    GPL 2.0                     Yes              Mibrary to build/edit ODT files
+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
 PHP_ExcelReader   2.21     MIT License                 Yes              Parse and retrieve information from XLS files
-Prototype         1.6.0.3  MIT License                 Yes              Ajax library
-PWC               1.3      MIT License                 Yes              Ajax library
-Scriptaculous     1.8.2    MIT License                 Yes              Ajax library
 Smarty            2.6.26   LGPL 2.1                    Yes              Templates engine used by some pages
 SMTPs             1.15     GPL                         Yes              SMTPS library
-VCard             2.0      GPL 2.0                     Yes              Fonctions vcard
+TCPDF             5.8.023  LGPL 3.0                    Yes
+VCard             2.0      GPL 2.0                     Yes              VCard library

 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
@@ -44,6 +48,7 @@ Copyright (C) 2010
 - Regis Houssin <regis@dolibarr.fr>
 - simnandez
 - r2gnl
+- meos

 Copyright (C) 2009
 - Laurent Destailleur <eldy@users.sourceforge.net>
--- a/224
+++ b/224
@@ -1,4 +1,220 @@
+--------------------------------------------------------------
 English Dolibarr ChangeLog
+$Id$
+--------------------------------------------------------------
+
+***** ChangeLog for 3.0 compared to 2.9 *****
+
+For users:
+- New: Can edit date of cheque receipts.
+- New: Add Sales journal and Purchase journal report.
+- New: Can create supplier invoice from supplier order.
+- New: Support login by openid
+- New: Support "full day" event in calendar module.
+- New: Add a weather on dashboard.
+- New: Add a Paypal module.
+- New: Can choose third party to use in point of sale module during logon.
+- New: A lot of enhancements into ECM module:
+       Directories can contains special characters,
+       Speed enhancements,
+       Directories can be created outside of Dolibarr, refresh button will 
+       update database,
+       Can rename a file.
+- New: Reordering lines in invoice, orders, commercial proposal is faster (use Ajax
+       technology).      
+- New: Can import members using assistant.
+- New: Can exclude deposit, replacement or credit notes in script rebuild_merge_pdf.
+- New: task #10473 : Option MAIN_PROFIDx_IN_ADDRESS must no more be hidden.
+- New: Can generate business card for on particular member.
+- New: Task #10553 : Can attach files on members card.
+- New: Can filter on payment type and bank account in payment lists.
+- New: When sending supplier orders by mail, a text is predefined.
+- New: Upgrade process works with Postgresql.
+- New: Task #10538: Add filter on expiration date of subscription for
+       foundation module email selector.
+- New: Task #9643: Add 2 status (tosell/tobuy) on products instead of only
+       1 status for both selling and buying.       
+- New: Can input payment conditions on several lines.
+- New: Add hidden option MAIN_LOGOUT_GOTO_URL to set the exit url after
+       a logout.
+- New: For germany, we invert order of address.
+- New: Add hidden option MAIN_SERVICES_ARE_ECOMMERCE_200238EC.
+- New: Support NPR in customer product prices.
+- New: Add more volume units (ounce, gallon, inch, feet, ...)
+- New: Delivery date accepts hours and minutes.
+- New: Can add a comment on stock dispatching to be save into stock movements.
+- New: Can filter product list with too low stocks.
+- New: Add option to send all emails sent to a bulk carbon copy.
+- New: Preview of emails sent by member module is shown.
+- New: task #10100 : Add button to create invoice from a subscription
+- New: Reorganize tabs on third parties.
+- New: Option MAIN_INVERT_SENDER_RECIPIENT is available in einstein pdf template.
+- New: Easier way to define url for clicktodial module.
+- New: Add a fckeditor test area in fckeditor module setup.
+- New: Add property "Event on full day" on agenda
+- New: Enhancement and better compatibility (google, thunderbird) for agenda export.
+- New: Can use image editor on user photo.
+- New: Task #10796: Add Spain ProfId1 Verification
+- New: Page "supplier summary" is now available.
+- New: Task #10611: Add option to choose order of field in bank account info on PDF
+- New: If a transaction was reconciliated and should not, there was no way to reverse error.
+- New: Ubuntu package now works also on debian.
+- Perf: Avoid reading database to determine country code after each
+        page call.
+- Fix: Special chars are now supported in ECM module for filename (not yet for
+       directories).
+- Fix: Better Postgresql compatibility.
+- Fix: Box order is saved when moved.
+- Fix: Database name can contains "-" characters.
+- Fix: In coloring negative amounts.
+- Fix: Date input use date format of user and not dd/mm/yyyy format.
+- Fix: Fixed a very old bug making file attachment fails with some emails 
+       readers when using "mail php function".
+- Fix: When cloning commercial proposal, due date is creation date + delay
+       by default.
+- Fix: Can edit ordering methods.
+
+For translators:
+- New: Update and complete slovenian language sl_SL.
+- New: Add full manually translated files for de_AT en de_DE (thanks to eCleaner.at).
+- New: Create the language ja_JP.
+- New: Add el_GR language.
+
+For developers:
+- New: Add jquery by default.
+- New: Removed PWC libraries.
+- New: Removed Scriptaculous libraries.
+- New: Removed Prototype libraries.
+- New: Add first Selenium GUI tests.
+- New: Enhance a lot of internal function to build external modules
+       more easily.
+- New: Add a user field ref_ext in object tables to allow external
+       systems to store their id and make self-developed synchronizing
+       functions easier to build.        
+- New: Local user timezone is saved into session (not used yet).
+- New: Works with Mysql 5.5.
+- Qual: Menu system code is simpler.
+- Qual: Mutualize some duplicate code.
+- Qual: Renamed some fields into database to be more internationnal.
+- Qual: Removed deprecated code.
+
+
+***** ChangeLog for 2.9 compared to 2.8 *****
+
+For users:
+- New: POS module allow to choose which warehouse to use.
+- New: Support "Department/State" field on company setup, contact, 
+       bank account and members card.
+- New: Can reopen a refused/canceled supplier order.
+- New: Add Gant diagramm on project module.
+- New: Add a new mode for automatic stock increase: Can be increased
+       on dispatching of products from a supplier order receipt.
+- New: Can set a past delay to limit calendar export.
+- New: Can attach files on emailing campaigns.
+- New: Add statistics on trips and expenses module.
+- New: Can reopen a closed customer order.
+- New: Add module externalsite to add a web site/tools inside 
+       menu and a Dolibarr frame.
+- New: Can link trips and fees to a project.
+- New: Add civility title in foundation module.
+- New: Can set accountancy code for product (buy and sell).
+- New: Can filter third parties lists on categories.
+- New: Can filter products and services lists on categories.
+- New: task #10202 : Support categories for members.
+- New: Can build documents for third parties (Using ODT templates, need PHP 5.2+). 
+- New: Support new products properties: length and area.
+- New: Add the "payment due before" field in invoice exports.
+- New: Add feature to resize or crop image files (for products photos)
+- New: task #10113 : Show list of emailing on clicking on "number of mass emailing received"
+- New: Add default language for third parties and use it when multilang is enabled
+       to define default language for document generation.
+- New: Can reopen a closed supplier invoice.
+- New: Move permission "see hidden categories" into "see hidden products/services".
+- New: Can delete several files at once in FTP module.
+- New: Add box "last contracts".
+- New: Works even if Web hosting provider has disabled PHP "glob" function.
+- New: Can now send supplier orders by email.
+- New: task #10076 : Show content of message in notification module.
+- New: Bank name is shown on invoice.
+- New: IBAN value is called IFSC if country is India.
+- New: Add option to choose to show firstname then name or name then firstname on PDF.
+- New: Add company in fields exported by export of members tool.
+- New: Reorganise bank menus.
+- New: Bookmarks can be sorted on a particular order.
+- New: Support spanish RE and IRPF taxes on invoices.
+- New: Module category offers categories for foundation module.
+- New: Can filter on category on third parties, products and members listings.
+- New: A flag is visible before country labels.
+- New: When activating a new module, permissions for admin user are set. This save
+       time when configuring Dolibarr.
+- New: Dolibarr 2.9 is faster than 2.8.
+- New: A lot of more predefined VAT values, states, regions for 
+       miscelaneous contries.
+- New: Enhance skin engine to make themes easier.
+- New: Add images into menu "eldy".
+- New: Auguria theme is now more modern.
+- New: Update tools refers to www.dolibarr.org but also www.dolistore.com web site.
+- New: Postgresql experimental support seems to work completely. 
+- New: Changes in Dolibarr core to allow to use cache servers (see Memcached module on
+       dolistore.com).
+- New: Default choice for interactive confirm box is yes by default, and no only for
+       delete actions. This reduce number of clicks required to validate actions and 
+       is still safe to dangerous actions.
+- Fix: Durations are correctly shown for languages using PM/AM dates.
+- Fix: A lot of fixes in Point of Sale module.
+- Fix: Debug experimental module widthrawal.
+- Fix: Format number was wrong for ar_AR language.
+- Fix: Can change password if user has only permission "change password".
+- Fix: Project PDF document shows all tasks.
+- Fix: bug #29278 : SMTP fails with IP instead of hostname.
+- Fix: Default language on login page was wrong.
+- Fix: Complete support of euros sign (even in PDF).
+- Fix: Bad setup of phpMyAdmin for DoliWamp installer.
+- Fix: Tracking number should be available on sending sheets.
+- Fix: Stock value is not reset when product is transfered into other warehouse. 
+- Fix: A lot of not tracked bugs fixed.
+- Fix: Some fixes in barcode management.
+- Fix: Access to phpMyAdmin is now ok on new DoliWamp installation.
+
+For translators:
+- Fix: Major update of italian translation (it_IT).
+- Fix: A lot of translation fixes in all languages.
+- New: Added translations (sl_SL, is_IS).
+- New: Add translations for the DoliWamp installer.
+
+For developers:
+- More comments in code.
+- Uniformize some code. 
+- All arrays "lignes" were renamed into "lines".
+- Delete all useless pre.inc.php files (this also increase speed).
+- Fix W3C errors in page forging.
+- Qual: Mutualize code of menu managers.
+- Better isolation of modules files and dolibarr core files. 
+- Task #8682 : Remove functions unix_timestamp.
+- The makepack tool now make pack with UID 500.
+- More css class and div to output menu to allow more skins.
+- Generated documentation can be build from Eclipse using Doxygen plugin.
+- Snapshot is provided with PHPunit tests.
+
+WARNING: 
+- A lot of class files (*.class.php) has moved into subdirectories. So If you use
+  or develop non official modules that includes Dolibarr classes, you will have to rename
+  path to thoose classes into the include function.
+- Also, parameters of the "fetch()" method for class "User" has changed to reflect
+  other fetch methods.   
+- If you build a personalised themes, you must rename the style sheet into style.css.php.   
+- This version is also the last one to support PHP 4.*, Mysql 3.1, IE6.
+  Dolibarr 3.* will be supported with PHP 5+ and MySql 4.1+ only.
+
+
+***** ChangeLog for 2.8.1 compared to 2.8 *****
+For users:
+- Fix: Works on database with _ in name.
+- Fix: Broken feature in trips and expense module.
+- Fix: Can use $ in database and login/pass values.
+- Fix: No error on upgrade if there is orphelins tasks.
+- Fix: Failed to login when user agent string was longer than 128.
+- Fix: bug #29526 : Numérotation Proposition Incorrecte après duplication


 ***** ChangeLog for 2.8 compared to 2.7 *****
@@ -20,16 +236,16 @@ For users:
 - New: Add a default errors-to email for emailing module.
 - New: Can filter on user on stock movement list.
 - New: When creating a third party from a member, it is set as a new
-  customer.
+       customer.
 - New: Can use {tttt} in numbering mask setup. It will be replaced
-  with third party type.
+       with third party type.
 - New: VAT number is stored in one field. This is more "international".
 - New: task #9782 : Add possibility to delete a warehouse.
 - New: task #9640 : Add label for stock movements.
 - New: task #9916 : Add FREE text for interventions card.
 - New: Can define the new product ref when cloning.
 - New: Project module support status of project and end date.
- New: Provide a debian/ubuntu package.
+- New: Provide a ubuntu package.
 - New: Add link to check a SIREN for french users.
 - New: Add link "now" to fill date when creating invoices.
 - Fix: Import module works even if prefix is empty in source file.
@@ -41,6 +257,8 @@ For users:
 - Fix: Running sending-email.php
 - Fix: Warning should not appears for invoice closed
 - Fix: Import for companies works even with prefix empty.
+- Fix: bug #28895 : Création d'utilisateur impossible.
+- Fix: Can change password if has only permission change password.

 For developers:
 - Qual: Reorganize /dev directory.
--- a/6
+++ b/6
@@ -27,7 +27,7 @@ install this version like this:
  as root for a new web server virtual host (second choice need to be web 
  server administrator).
  
- Create an empty file "htdocs/conf/config.php" and set permissions for your web
+- 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
@@ -68,7 +68,7 @@ To upgrade Dolibarr from an old version to this one:
  http://yourdolibarrhost/something/install/
  
  Then choose the "update" option according to your case.
-  Note: Migrate process can ben runned safely several times.
+  Note: Migrate process can be ran safely several times.
  

 III - WHAT'S NEW
@@ -97,7 +97,7 @@ Main modules/features:
 - ECM (Electronic Content Management)
 - EMailings
 - Agenda with ical,vcal export for third tools integration
- Management of fundation members
+- Management of foundation members
 - Donation management

 Other modules:
--- a/4
+++ b/4
@@ -1,10 +1,10 @@
 README (french)
 --------------------------------
-Documentation demarrage rapide
+Documentation démarrage rapide
 --------------------------------

 1) Installer Dolibarr
-2) Mettre a jour Dolibarr depuis une ancienne version
+2) Mettre à jour Dolibarr depuis une ancienne version
 3) Ce qui est nouveau dans cette version
 4) Ce que peux faire Dolibarr
 5) Ce que ne peux pas faire Dolibarr (pas encore)
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -7,7 +7,9 @@ makepack-google.conf
 module_google-*.tgz
 module_pibarcode-1.0.tgz
 *.exe
+*.tgz
 *.torrent
+*.zip
 version-phpsane.txt
 makepack-phpsane.conf
 html
--- 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/config
+++ b/build/deb/config
@@ -19,7 +19,7 @@ set -e
 db_version 2.0


-echo Run the config script
+echo Run the dolibarr config script

 # Rotate old configuration
 if [ "$1" = "reconfigure" ] ; then
--- a/build/deb/control
+++ b/build/deb/control
@@ -1,42 +1,42 @@
-Source: dolibarr
+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
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Package: dolibarr
-Section: web
-Architecture: all
-Essential: no
-Depends: wwwconfig-common, apache2, libapache2-mod-php5, php5, php5-cgi, php5-curl, php5-gd, php5-imagick, php5-ldap, php5-mcrypt, php5-mysql, mysql-server, perl
 Recommends: mozilla | netscape
-Installed-Size: 31200
 Homepage: http://www.dolibarr.org
-Description: Dolibarr ERP/CRM
+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 
+ 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
- * Commercial actions management
 * Orders management
- * Commercial proposals management with PDF export
- * Contracts management
- * Invoices management with PDF export
+ * 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
- * Emailings
+ * Mass Emailings
 * Reports
 * Data export and import tools
 * LDAP connectivity
- 
+ * PDF exports
+ * And a lot of other modules
--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -1,6 +1,7 @@
 [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
 GenericName=Dolibarr ERP/CRM
@@ -10,7 +11,8 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Category=Application;Office
+Category=Application;Office;
 StartupNotify=true
+InitialPreference=5
 #NoDisplay=true
 #OnlyShowIn=GNOME
--- a/build/deb/dolibarr.menu
+++ b/build/deb/dolibarr.menu
@@ -1,4 +1,6 @@
 # This file seems to be useless for Ubuntu
 # Good way to add menu on Ubuntu is adding file dolibarr.desktop
-?package(dolibarr):needs="X11" section="Applications/File Management" \
-  title="Dolibarr" command="/usr/share/dolibarr/build/deb/rundolibarr.sh" icon="/usr/share/pixmaps/dolibarr.xpm"
+?package(dolibarr):needs="X11" section="Applications/Office"\
+  title="Dolibarr ERP & CRM" longtitle="The manager for small and medium enterprises or foundations"\
+  description="Dolibarr ERP & CRM features agenda, orders, invoices and stock management, marketing campaigns, POS, etc."\
+  command="/usr/share/dolibarr/build/deb/rundolibarr.sh" icon="/usr/share/pixmaps/dolibarr.xpm"
--- a/build/deb/install.forced.php.install
+++ b/build/deb/install.forced.php.install
@@ -12,5 +12,5 @@ $force_install_databaserootlogin='__SUPERUSERLOGIN__';
 $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
-$force_install_lockinstall='1';
+$force_install_lockinstall='444';
 ?>
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -20,31 +20,8 @@ set -e

 db_version 2.0

-#
-# Description:	Verifies that the env module is loaded in the apache config file.
-# Needs:	$server the apache server to use,
-#			anything that matches /etc/$server/*.conf
-#
-env_enable()
-{
-    envverm="env_module"
-    if grep -e "^[[:space:]]*#[[:space:]]*LoadModule[[:space:]]\+$envverm" /etc/$server/httpd.conf > /dev/null 2>&1; then
-		# Uncommenting
-	sed -e "s#\([[:space:]]*\)\#[[:space:]]\+\(LoadModule $envverm\)#\1\2#" /etc/$server/httpd.conf > /etc/$server/httpd.conf.tmp
-	status=uncomment
-	if grep -e "^[[:space:]]*LoadModule[[:space:]]\+$envverm" /etc/$server/httpd.conf.tmp >/dev/null 2>&1; then
-			# Uncomment successful.
-	    cp /etc/$server/httpd.conf /etc/$server/httpd.conf.back >/dev/null 2>&1
-	    mv /etc/$server/httpd.conf.tmp /etc/$server/httpd.conf
-	else
-			# Uncomment unsuccessful.
-	    status=error
-	    rm /etc/$server/httpd.conf.tmp
-	fi
-    fi
-}

-echo Run the postinst script
+echo Run the dolibarr postinst script

 case "$1" in
 	configure)
@@ -52,7 +29,7 @@ case "$1" in
 		# Copy include for apache.conf
 		fileorig="/usr/share/dolibarr/build/deb/apache.conf"
 		config="/etc/dolibarr/apache.conf"
-		mkdir -p /etc/dolibarr
+        mkdir -p /etc/dolibarr
 		cp -p $fileorig $config

 		# Create install.forced.php
@@ -72,6 +49,12 @@ case "$1" in
 			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
 		fi
 		
+        # Create /var/lib/dolibarr/documents
+        mkdir -p /var/lib/dolibarr/documents
+        chown -R www-data.www-data /var/lib/dolibarr/documents;
+        chmod -R 775 /var/lib/dolibarr/documents;
+        chmod -R g+s /var/lib/dolibarr/documents;
+
 		# Create empty conf.php
 		if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
 		then 
@@ -93,28 +76,27 @@ case "$1" in
 			Both)		webservers="apache2 apache2-ssl" ;;
 			*)		    webservers="apache2 apache2-ssl" ;;
 		esac
-		# Define variable phpver and phpini
-		. /usr/share/wwwconfig-common/php.get

 		# Set up web server.
 		for server in $webservers ; do
 			echo Complete config of server $server
-			env_enable
 			
-			# Add info for PHP (might be obsolete)
-			typestr='application/x-httpd-php'
-			extension='.php'
-			. /usr/share/wwwconfig-common/apache-addtype_all.sh
+			# Add info for PHP (obsolete)
+			#typestr='application/x-httpd-php'
+			#extension='.php'
+			#. /usr/share/wwwconfig-common/apache-addtype_all.sh
 			
-			# Enable PHP module (might be obsolete)
+			# Enable PHP module (obsolete)
 			#. /usr/share/wwwconfig-common/apache-php.sh
 			#echo Result of enabling PHP modules: $status
 			
 			# Detect webuser and webgroup
 			webuser=
 			webgroup=
-			. /usr/share/wwwconfig-common/apache-run.get
-			echo Web user.group found is $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
@@ -133,27 +115,32 @@ case "$1" in

 			includefile="/etc/dolibarr/apache.conf"
 			#echo "$includefile $server" 
-			. /usr/share/wwwconfig-common/apache-include_all.sh
+			. /usr/share/dolibarr/build/deb/apache-include_all.sh
 			test "$status" = "uncomment" -o "$status" = "include" && restart="$server $restart"
-			for index in index.php; do
-				. /usr/share/wwwconfig-common/apache-index_all.sh
-				test "$status" = "added" && restart="$server $restart"
-			done
+			
+			# (useless)
+			#for index in index.php; do
+			#	. /usr/share/wwwconfig-common/apache-index_all.sh
+			#	test "$status" = "added" && restart="$server $restart"
+			#done
 		done

 		# Copy icon file
-		echo "Copy icon file"
-		fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm"
-		target="/usr/share/pixmaps/"
-		cp -p $fileorig $target
+		#echo "Copy icon file"
+		#fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm"
+		#target="/usr/share/pixmaps/"
+		#cp -f $fileorig $target

-		echo "Install menu entry"
+		#echo "Install menu entry"
 		# This one is for Gnome ubuntu
-		fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
-		target="/usr/share/applications/"
-		cp -p $fileorig $target
-		# Not sure this one is usefulle
-		if test -x /usr/bin/update-menus; then update-menus; fi
+		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
+		#target="/usr/share/applications/"
+		#cp -f $fileorig $target
+		# Not sure this is usefull
+		if test -x /usr/bin/update-menus; then 
+			echo "update-menus"
+			update-menus;
+		fi
 		
 		# TODO Create the file to force parameters in Web installer
 		#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
@@ -173,6 +160,7 @@ case "$1" in
 			# 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
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -21,7 +21,7 @@ set -e

 db_version 2.0

-echo Run the postrm script
+echo Run the dolibarr postrm script

 #echo "postrm db_get dolibarr/webserver"
 # We disable set -e to avoid premature end of script if error
@@ -99,7 +99,48 @@ case "$1" in
 			#               mysql
 			#               /usr/share/wwwconfig-common/mysql.get
 			echo "postrm Delete database $dbname on server $dbserver using account $dbadmin"
-			. /usr/share/wwwconfig-common/${dbtype}-dropdb.sh
+
+			# Define mysqlcmd
+			if [ -z "$dbserver" ] || [ "$dbserver" = "localhost" ]; then
+				hostopt=""
+			    dbserver=localhost
+			else
+			    case "$dbserver" in
+				:*)
+				    dbsocket=`echo $dbserver | sed -e 's/^://'`
+				    hostopt="-S $dbsocket"
+				    ;;
+				*)
+				    hostopt="-h $dbserver"
+				    ;;
+			    esac
+			fi
+			if [ -z "$dbadmpass" ] ; then
+			    log="${log}No password used."
+			    passopt=""
+			else
+			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
+			fi
+			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
+
+		    # 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
+		    else
+			status=nothing
+			log="${log}Database $dbname already not exists."
+		    fi

 		else
 			echo "postrm Delete of dolibarr database not wanted" 
@@ -114,10 +155,17 @@ case "$1" in
 			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
-					echo postrm remove dolibarr include from /etc/dolibarr/apache.conf
 					set +e
-					. /usr/share/wwwconfig-common/apache-uninclude.sh
+				    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
@@ -136,20 +184,36 @@ case "$1" in
 		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 rm -rf ${dir} ; fi
+			if [ -d $dir ] ; then 
+                # We disable blocking errors
+                set +e
+			    echo "Remove directory $dir"
+			    rm -rf $dir ; 
+                # We restore blocking errors
+                set -e
+			fi
 		done
 		
+		# We clean variable (we ignore errors because db_reset can fails if var was never set)
+        set +e
 		db_reset "dolibarr/postrm"
+        set -e
+        
 		db_purge
 	;;

@@ -157,11 +221,11 @@ case "$1" in
 		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
+		#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
 	;;
--- a/build/dmg/dolimamp/install.forced.php
+++ b/build/dmg/dolimamp/install.forced.php
@@ -12,5 +12,5 @@ $force_install_databaserootlogin='root';
 $force_install_databaserootpass='root';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
-$force_install_lockinstall='1';
+$force_install_lockinstall='444';
 ?>
--- a/build/doap/doap_dolibarr.rdf
+++ b/build/doap/doap_dolibarr.rdf
@@ -48,8 +48,8 @@
 	<release>
 		<Version>
 			<name>stable</name>
-			<created>2009-12-01</created>
-			<revision>2.7</revision>
+			<created>2011-02-09</created>
+			<revision>3.0.0</revision>
 		</Version>
 	</release>

--- a/build/dolibarr-doxygen-build.pl
+++ b/build/dolibarr-doxygen-build.pl
@@ -13,21 +13,21 @@ $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 $OPTIONS="";
 #$OPTIONS="-d Preprocessor";

-$CONFFILE="doxygen/dolibarr-doxygen.doxyfile";
+$CONFFILE="dolibarr-doxygen.doxyfile";

 use Cwd;
 my $dir = getcwd;
    
 print "Current dir is: $dir\n";
-print "Running dir for doxygen must be: $DIR\n";
+print "Running dir for doxygen must be: $DIR/doxygen\n";

 if (! -s $CONFFILE)
 {
    print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
    print "\n";
 	print "Change your current directory then, to launch the script, run:\n";
-	print '> perl dolibarr-doxygen-build.pl  (on Windows)'."\n";
-	print '> perl dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
+	print '> perl ..\dolibarr-doxygen-build.pl  (on Windows)'."\n";
+	print '> perl ../dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
    sleep 4;
    exit 1;   
 }
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
--- a/build/exe/doliwamp/Languages/MyBasque.isl
+++ b/build/exe/doliwamp/Languages/MyBasque.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 %2 bertsioa
+AdditionalIcons=Ikono gehigarriak:
+CreateDesktopIcon=&Mahaigainean lasterbidea sortu
+CreateQuickLaunchIcon=&Ataza Barran lasterbidea sortu
+ProgramOnTheWeb=%1 sarean
+UninstallProgram=%1 desinstalatu
+LaunchProgram=%1 abiarazi
+AssocFileExtension=&Lotu %1 programa %2 fitxategi luzapenarekin
+AssocingFileExtension=%1 programa %2 fitxategi luzapenarekin lotzen...
--- a/build/exe/doliwamp/Languages/MyBrazilianPortuguese.isl
+++ b/build/exe/doliwamp/Languages/MyBrazilianPortuguese.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 vers<72>o %2
+AdditionalIcons=<3D>cones adicionais:
+CreateDesktopIcon=Criar um <20>cone na <20>rea de &Trabalho
+CreateQuickLaunchIcon=Criar um <20>cone na &Barra de Inicializa<7A><61>o R<>pida
+ProgramOnTheWeb=%1 na Internet
+UninstallProgram=Desinstalar %1
+LaunchProgram=Executar %1
+AssocFileExtension=Associar %1 com a e&xtens<6E>o de arquivo %2
+AssocingFileExtension=Associando %1 com a extens<6E>o de arquivo...
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -0,0 +1,40 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 versi<73> %2
+AdditionalIcons=Icones addicionals:
+CreateDesktopIcon=Crea una icona a l'&Escriptori
+CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
+ProgramOnTheWeb=%1 a Internet
+UninstallProgram=Desinstal<61>la %1
+LaunchProgram=Obre %1
+AssocFileExtension=&Associa %1 amb l'extensi<73> de fitxer %2
+AssocingFileExtension=Associant %1 amb l'extensi<73> de fitxer %2...
+
+YouWillInstallDoliWamp=Va a instal<61>lar o actualitzar (Apache + Mysql + PHP + Dolibarr) al seu ordinador.
+ThisAssistantInstallOrUpgrade=Aquest assistent instal<61>la o actualitza Dolibarr ERP-CRM i tots els seus requisits (Apache, Mysql i PHP) optimitzats per a l'<27>s de Dolibarr.
+IfYouHaveTechnicalKnowledge=Si teniu coneixements t<>cnics i necessita usar la seva Apache, Mysql i PHP amb altres aplicacions a part de Dolibarr, no utilitzeu aquest assistent, hauria laci<63> manual d'Dolibarr sobre un Apache, Mysql i PHP existent.
+ButIfYouLook=Per<65> si busca una instal<61>laci<63> autom<6F>tica, es troba en el bon cam<61>...
+DoYouWantToStart=Vol iniciar el proc<6F>s d'instal<61>laci<63>/actualitzaci<63>?
+
+TechnicalParameters=Par<61>metres t<>cnics
+IfFirstInstall=Si es tracta de la primera instal laci<63>, haur<75> d'especificar alguns par<61>metres t<>cnics. Si no els ent<6E>n, no sabeu o va a procedir a una actualitzaci<63>, deixi els camps amb els valors proposats per defecte.
+
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (El seu o el del seu ISP, <20>nicament primera instal.laci<63>) :
+ApachePort=Puerto Apache (<28>nicament primera instal.laci<63>, normalment <20>s el 80) :
+MySqlPort=Puerto Mysql (<28>nicament primera instal.laci<63>, normalment <20>s el 3306) :
+MySqlPassword=Contrasenya del servidor i la base de dades MySQL de root (<28>nicament primera instal.laci<63>):
+
+FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci<63> del fitxer %1/www/dolibarr/install.lock. Pot ignorar l'av<61>s per<65> <20>s possible que hagi de eliminar-lo manualment m<>s tard. En aquest cas, ser<65> informat. Feu clic a OK per continuar...
+
+PortAlreadyInUse=Sembla que el port %1 ja est<73> sent utilitzat. Es recomana cancel<65>lar, tornar enrere i especificar un altre valor per al port% 2. Cancel<65>lar i escollir un altre valor?
+
+FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
+ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est<73> segur, simplement feu clic a Obrir:
+
+LaunchNow=Llan<61>ar ara Dolibarr
+
+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?
--- a/build/exe/doliwamp/Languages/MyCzech.isl
+++ b/build/exe/doliwamp/Languages/MyCzech.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 verze %2
+AdditionalIcons=Dal<61><6C> z<>stupci:
+CreateDesktopIcon=Vytvo<76>it z<>stupce na &plo<6C>e
+CreateQuickLaunchIcon=Vytvo<76>it z<>stupce na panelu &Snadn<64> spu<70>t<EFBFBD>n<EFBFBD>
+ProgramOnTheWeb=Aplikace %1 na internetu
+UninstallProgram=Odinstalovat aplikaci %1
+LaunchProgram=Spustit aplikaci %1
+AssocFileExtension=Vytvo<76>it &asociaci mezi soubory typu %2 a aplikac<61> %1
+AssocingFileExtension=Vytv<74><76><EFBFBD> se asociace mezi soubory typu %2 a aplikac<61> %1...
--- a/build/exe/doliwamp/Languages/MyDanish.isl
+++ b/build/exe/doliwamp/Languages/MyDanish.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 version %2
+AdditionalIcons=Ekstra ikoner:
+CreateDesktopIcon=Lav ikon p<> skrive&bordet
+CreateQuickLaunchIcon=Lav &hurtigstart-ikon
+ProgramOnTheWeb=%1 p<> internettet
+UninstallProgram=Afinstaller (fjern) %1
+LaunchProgram=&K<>r %1
+AssocFileExtension=Sammen&k<>d %1 med filtypen %2
+AssocingFileExtension=Sammenk<6E>der %1 med filtypen %2...
--- a/build/exe/doliwamp/Languages/MyDutch.isl
+++ b/build/exe/doliwamp/Languages/MyDutch.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 versie %2
+AdditionalIcons=Extra snelkoppelingen:
+CreateDesktopIcon=Maak een snelkoppeling op het &bureaublad
+CreateQuickLaunchIcon=Maak een snelkoppeling op de &Snel starten werkbalk
+ProgramOnTheWeb=%1 op het Web
+UninstallProgram=Verwijder %1
+LaunchProgram=&Start %1
+AssocFileExtension=&Koppel %1 aan de %2 bestandsextensie
+AssocingFileExtension=Bezig met koppelen van %1 aan de %2 bestandsextensie...
--- a/build/exe/doliwamp/Languages/MyEnglish.isl
+++ b/build/exe/doliwamp/Languages/MyEnglish.isl
@@ -0,0 +1,44 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 version %2
+AdditionalIcons=Additional icons:
+CreateDesktopIcon=Create a &desktop icon
+CreateQuickLaunchIcon=Create a &Quick Launch icon
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=Uninstall %1
+LaunchProgram=Launch %1
+AssocFileExtension=&Associate %1 with the %2 file extension
+AssocingFileExtension=Associating %1 with the %2 file extension...
+
+YouWillInstallDoliWamp=You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.
+ThisAssistantInstallOrUpgrade=This assistant installs or upgrades Dolibarr ERP-CRM and all required third party softwares (Apache, Mysql and PHP) optimized for a Dolibarr usage.
+IfYouHaveTechnicalKnowledge=If you have technical knowledge and plan to share your Apache, Mysql and PHP with other projects than Dolibarr, you should not use this assistant and make a manual installation of Dolibarr on your existing Apache, Mysql and PHP installation.
+ButIfYouLook=But if you look for an automatic setup, you''re on the good way...
+DoYouWantToStart=Do you want to start installation/upgrade process ?
+
+TechnicalParameters=Technical parameters
+IfFirstInstall=If first install, please specify some technical parameters. If you don't understand, are not sure, or are doing an upgrade, just leave the default values.
+
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=SMTP server (your own or ISP SMTP server, first install only) :
+ApachePort=Apache port (first install only, common choice is 80) :
+MySqlPort=MySql port (first install only, common choice is 3306) :
+MySqlPassword=MySql server and database password you want for root (first install only):
+
+FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You can ignore warning but you may have to remove it manually later when asked. Click OK to continue...
+
+PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?
+
+FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
+ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
+
+LaunchNow=Launch Dolibarr now
+
+ProgramHasBeenRemoved=Dolibarr program files have been removed. However, all your data files are still in directory %1. You must remove this directory manually for a complete uninstall.
+
+DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache and Mysql, this may last from several seconds to one minute after this confirmation. Start to install or upgrade the web and database server required by Dolibarr ?
+
+OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
+OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version
+
--- a/build/exe/doliwamp/Languages/MyFinnish.isl
+++ b/build/exe/doliwamp/Languages/MyFinnish.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 versio %2
+AdditionalIcons=Lis<69>kuvakkeet:
+CreateDesktopIcon=Lu&o kuvake ty<74>p<EFBFBD>yd<79>lle
+CreateQuickLaunchIcon=Luo kuvake &pikak<61>ynnistyspalkkiin
+ProgramOnTheWeb=%1 Internetiss<73>
+UninstallProgram=Poista %1
+LaunchProgram=&K<>ynnist<73> %1
+AssocFileExtension=&Yhdist<73> %1 tiedostop<6F><70>tteeseen %2
+AssocingFileExtension=Yhdistet<65><74>n %1 tiedostop<6F><70>tteeseen %2 ...
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -0,0 +1,45 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 version %2
+AdditionalIcons=Ic<49>nes suppl<70>mentaires :
+CreateDesktopIcon=Cr<43>er une ic<69>ne sur le &Bureau
+CreateQuickLaunchIcon=Cr<43>er une ic<69>ne dans la barre de &Lancement rapide
+ProgramOnTheWeb=Page d'accueil de %1
+UninstallProgram=D<>sinstaller %1
+LaunchProgram=Ex<45>cuter %1
+AssocFileExtension=&Associer %1 avec l'extension de fichier %2
+AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
+
+YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp (Apache+Mysql+PHP+Dolibarr) sur votre ordinateur.
+ThisAssistantInstallOrUpgrade=Cet assistant installe ou met <20> jour Dolibarr ERP-CRM et tous ses composants pr<70>requis (Apache, Mysql et PHP) optimis<69>s pour une utilisation de Dolibarr.
+IfYouHaveTechnicalKnowledge=Si vous avez des comp<6D>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d'autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<75>t une installation manuelle de Dolibarr sur un socle Apache, Mysql et PHP existant.
+ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e, vous <20>tes sur la bonne voie...
+DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation/mise <20> jour ?
+
+TechnicalParameters=Param<61>tres techniques
+IfFirstInstall=S'il s'agit de la premi<6D>re installation, merci de sp<73>cifier ces quelques param<61>tres techniques. Si vous ne les comprennez pas, <20>tes non s<>r, ou proc<6F>dez <20> une mise <20> jour, laissez les champs avec les valeurs propos<6F>es par d<>faut.
+
+
+; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Serveur SMTP (le votre ou celui de votre FAI, premi<6D>re installation uniquement) :
+ApachePort=Port Apache (premi<6D>re installation uniquement, le choix standard est 80) :
+MySqlPort=Port Mysql (premi<6D>re installation uniquement, le choix standard est 3306) :
+MySqlPassword=Mot de passe serveur+base MySql de root (premi<6D>re installation uniquement):
+
+FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signal<61>. Cliquez sur OK pour continuer...
+
+PortAlreadyInUse=Le port %1 semble d<>j<EFBFBD> utilis<69>. Il est recommand<6E> d'annuler pour revenir en arri<72>re et sp<73>cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
+
+FirefoxDetected=Firefox a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
+ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut. Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
+
+LaunchNow=Lancer Dolibarr maintenant
+
+ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont <20>t<EFBFBD> supprim<69>s. Toutefois, tous vos fichiers de donn<6E>es sont toujours dans le r<>pertoire %1. Vous devez supprimer ce r<>pertoire manuellement pour avoir une d<>sinstallation compl<70>te.
+
+DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d<>marrer ou red<65>marrer Apache et Mysql, ceci peut durer de quelques secondes <20> une minute apr<70>s cette confirmation. D<>marrer l'installation ou mise <20> jour du serveur web et base de donn<6E>es requis par Dolibarr ?
+
+OldVersionFoundAndMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e et d<>plac<61>e pour fonctionner avec la nouvelle version de Dolibarr.
+OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e mais ne peut <20>tre d<>plac<61>e pour <20>tre utilis<69>e avec la nouvelle version de Dolibarr.
+
--- a/build/exe/doliwamp/Languages/MyGerman.isl
+++ b/build/exe/doliwamp/Languages/MyGerman.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 Version %2
+AdditionalIcons=Zus<75>tzliche Symbole:
+CreateDesktopIcon=&Desktop-Symbol erstellen
+CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
+ProgramOnTheWeb=%1 im Internet
+UninstallProgram=%1 entfernen
+LaunchProgram=%1 starten
+AssocFileExtension=&Registriere %1 mit der %2-Dateierweiterung
+AssocingFileExtension=%1 wird mit der %2-Dateierweiterung registriert...
--- a/build/exe/doliwamp/Languages/MyHebrew.isl
+++ b/build/exe/doliwamp/Languages/MyHebrew.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 <20><><EFBFBD><EFBFBD><EFBFBD> %2
+AdditionalIcons=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
+CreateDesktopIcon=<3D><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> &<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+CreateQuickLaunchIcon=<3D><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ProgramOnTheWeb=%1 <20><><EFBFBD><EFBFBD>
+UninstallProgram=<3D><><EFBFBD> <20><> %1
+LaunchProgram=<3D><><EFBFBD><EFBFBD> %1
+AssocFileExtension=&<26><><EFBFBD> <20><> %1 <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %2
+AssocingFileExtension=<3D><><EFBFBD><EFBFBD> <20><> %1 <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %2
--- a/build/exe/doliwamp/Languages/MyHungarian.isl
+++ b/build/exe/doliwamp/Languages/MyHungarian.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 %2 verzi<7A>
+AdditionalIcons=Tov<6F>bbi ikonok:
+CreateDesktopIcon=Ikon l<>trehoz<6F>sa az &Asztalon
+CreateQuickLaunchIcon=Ikon l<>trehoz<6F>sa a &Gyorsind<6E>t<EFBFBD>s eszk<7A>zt<7A>ron
+ProgramOnTheWeb=%1 a weben
+UninstallProgram=%1 elt<6C>vol<6F>t<EFBFBD>sa
+LaunchProgram=%1 elind<6E>t<EFBFBD>sa
+AssocFileExtension=A(z) %1 &t<>rs<72>t<EFBFBD>sa a(z) %2 f<>jlkiterjeszt<7A>ssel
+AssocingFileExtension=A(z) %1 t<>rs<72>t<EFBFBD>sa a(z) %2 f<>jlkiterjeszt<7A>ssel...
--- a/build/exe/doliwamp/Languages/MyItalian.isl
+++ b/build/exe/doliwamp/Languages/MyItalian.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 versione %2
+AdditionalIcons=Icone aggiuntive:
+CreateDesktopIcon=Crea un'icona sul &desktop
+CreateQuickLaunchIcon=Crea un'icona nella barra &Avvio veloce
+ProgramOnTheWeb=%1 sul Web
+UninstallProgram=Disinstalla %1
+LaunchProgram=Avvia %1
+AssocFileExtension=&Associa l'estensione %2 a %1
+AssocingFileExtension=Associazione dell'estensione %2 a %1 in corso...
--- a/build/exe/doliwamp/Languages/MyJapanese.isl
+++ b/build/exe/doliwamp/Languages/MyJapanese.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 <20>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> %2
+AdditionalIcons=<3D>A<EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>ǉ<EFBFBD><C789><EFBFBD><EFBFBD><EFBFBD>:
+CreateDesktopIcon=<3D>f<EFBFBD>X<EFBFBD>N<EFBFBD>g<EFBFBD>b<EFBFBD>v<EFBFBD><76><EFBFBD>ɃA<C983>C<EFBFBD>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>쐬<EFBFBD><EC90AC><EFBFBD><EFBFBD>(&D)
+CreateQuickLaunchIcon=<3D>N<EFBFBD>C<EFBFBD>b<EFBFBD>N<EFBFBD>N<EFBFBD><4E><EFBFBD>A<EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>쐬<EFBFBD><EC90AC><EFBFBD><EFBFBD>(&Q)
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=%1 <20><><EFBFBD>A<EFBFBD><41><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+LaunchProgram=%1 <20><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD>
+AssocFileExtension=%2 <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD> %1<><31><EFBFBD>֘A<D698>t<EFBFBD><74><EFBFBD>܂<EFBFBD><DC82>B
+AssocingFileExtension=%2 <20><> %1<><31><EFBFBD>֘A<D698>t<EFBFBD><74><EFBFBD>܂<EFBFBD><DC82>B
--- a/build/exe/doliwamp/Languages/MyNorwegian.isl
+++ b/build/exe/doliwamp/Languages/MyNorwegian.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 versjon %2
+AdditionalIcons=Ekstra-ikoner:
+CreateDesktopIcon=Lag ikon p<> &skrivebordet
+CreateQuickLaunchIcon=Lag et &Hurtigstarts-ikon
+ProgramOnTheWeb=%1 p<> nettet
+UninstallProgram=Avinstaller %1
+LaunchProgram=Kj<4B>r %1
+AssocFileExtension=&Koble %1 med filetternavnet %2
+AssocingFileExtension=Kobler %1 med filetternavnet %2...
--- a/build/exe/doliwamp/Languages/MyPolish.isl
+++ b/build/exe/doliwamp/Languages/MyPolish.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 wersja %2
+AdditionalIcons=Dodatkowe ikony:
+CreateDesktopIcon=Utw<74>rz ikon<6F> na &pulpicie
+CreateQuickLaunchIcon=Utw<74>rz ikon<6F> na pasku &szybkiego uruchamiania
+ProgramOnTheWeb=Strona WWW programu %1
+UninstallProgram=Deinstalacja programu %1
+LaunchProgram=Uruchom program %1
+AssocFileExtension=&Przypisz program %1 do rozszerzenia pliku %2
+AssocingFileExtension=Przypisywanie programu %1 do rozszerzenia pliku %2...
--- a/build/exe/doliwamp/Languages/MyPortuguese.isl
+++ b/build/exe/doliwamp/Languages/MyPortuguese.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 vers<72>o %2
+AdditionalIcons=<3D>cones adicionais:
+CreateDesktopIcon=Criar <20>cone no Ambiente de &Trabalho
+CreateQuickLaunchIcon=&Criar <20>cone na barra de Inicia<69><61>o R<>pida
+ProgramOnTheWeb=%1 na Web
+UninstallProgram=Desinstalar o %1
+LaunchProgram=Executar o %1
+AssocFileExtension=Associa&r o %1 aos ficheiros com a extens<6E>o %2
+AssocingFileExtension=A associar o %1 aos ficheiros com a extens<6E>o %2...
--- a/build/exe/doliwamp/Languages/MyRussian.isl
+++ b/build/exe/doliwamp/Languages/MyRussian.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %2
+AdditionalIcons=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
+CreateDesktopIcon=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+CreateQuickLaunchIcon=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ProgramOnTheWeb=<3D><><EFBFBD><EFBFBD> %1 <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+UninstallProgram=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %1
+LaunchProgram=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %1
+AssocFileExtension=<3D><>&<26><><EFBFBD><EFBFBD><EFBFBD> %1 <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %2
+AssocingFileExtension=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %1 <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %2...
--- a/build/exe/doliwamp/Languages/MySlovak.isl
+++ b/build/exe/doliwamp/Languages/MySlovak.isl
@@ -0,0 +1,11 @@
+
+[CustomMessages]
+NameAndVersion=%1 verzia %2
+AdditionalIcons=<3D>al<61><6C> z<>stupcovia:
+CreateDesktopIcon=Vytvori<72> z<>stupcu na &ploche
+CreateQuickLaunchIcon=Vytvori<72> z<>stupcu na paneli &R<>chle spustenie
+ProgramOnTheWeb=Aplik<69>cia %1 na internete
+UninstallProgram=Odin<69>talova<76> aplik<69>ciu %1 
+LaunchProgram=Spusti<74> aplik<69>ciu %1
+AssocFileExtension=Vytvori<72> &asoci<63>ciu medzi s<>bormi typu %2 a aplik<69>ciou %1
+AssocingFileExtension=Vytv<74>ra sa asoci<63>cia medzi s<>bormi typu %2 a aplik<69>ciou %1...
--- a/build/exe/doliwamp/Languages/MySlovenian.isl
+++ b/build/exe/doliwamp/Languages/MySlovenian.isl
@@ -0,0 +1,12 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 razli<6C>ica %2
+AdditionalIcons=Dodatne ikone:
+CreateDesktopIcon=Ustvari ikono na &namizju
+CreateQuickLaunchIcon=Ustvari ikono za &hitri zagon
+ProgramOnTheWeb=%1 na spletu
+UninstallProgram=Odstrani %1
+LaunchProgram=Odpri %1
+AssocFileExtension=&Pove<76>i %1 s pripono %2
+AssocingFileExtension=Povezujem %1 s pripono %2...
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -0,0 +1,40 @@
+
+[CustomMessages]
+
+NameAndVersion=%1 versi<73>n %2
+AdditionalIcons=Iconos adicionales:
+CreateDesktopIcon=Crear un icono en el &escritorio
+CreateQuickLaunchIcon=Crear un icono de Inicio R<>pido
+ProgramOnTheWeb=%1 en la Web
+UninstallProgram=Desinstalar %1
+LaunchProgram=Ejecutar %1
+AssocFileExtension=&Asociar %1 con la extensi<73>n de archivo %2
+AssocingFileExtension=Asociando %1 con la extensi<73>n de archivo %2...
+
+YouWillInstallDoliWamp=Va a instalar o actualizar (Apache+Mysql+PHP+Dolibarr) en su ordenador.
+ThisAssistantInstallOrUpgrade=Este asistente instala o actualiza Dolibarr ERP-CRM y todos sus requisitos (Apache, Mysql y PHP) optimizados para el uso de  Dolibarr.
+IfYouHaveTechnicalKnowledge=Si tiene conocimientos t<>cnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no deber<65>a usar este asistente, deber<65>a realizar una instalaci<63>n manual de Dolibarr sobre un Apache, Mysql y PHP existente.
+ButIfYouLook=Pero si busca una instalaci<63>n autom<6F>tica, se encuentra en el buen camino...
+DoYouWantToStart=<3D>Quiere iniciar el proceso de instalaci<63>n/actualizaci<63>n?
+
+TechnicalParameters=Par<61>metros t<>cnicos
+IfFirstInstall=Si se trata de la primera instalaci<63>n, deber<65> especificar algunos par<61>metros t<>cnicos. Si no los entiende, no est<73> seguro o va a proceder a una actualizaci<63>n, deje los campos con los valores propuestos por defecto.
+
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (El suyo o el de su ISP, <20>nicamente primera instalaci<63>n) :
+ApachePort=Puerto Apache (<28>nicamente primera instalaci<63>n, normalmente es el 80) :
+MySqlPort=Puerto Mysql (<28>nicamente primera instalaci<63>n, normalmente es el 3306) :
+MySqlPassword=Contrase<73>a del servidor y la base de datos MySQL de root (<28>nicamente primera instalaci<63>n):
+
+FailedToDeleteLock=Error en la eliminaci<63>n del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente m<>s tarde. En este caso, ser<65> informado. Haga clic en OK para continuar...
+
+PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. <20>Cancelar y escojer otro valor?
+
+FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
+ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est<73> seguro, simplementa haga clic en Abrir :
+
+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 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/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -34,7 +34,7 @@ $cfg['PmaAbsoluteUri'] = '';
 * Disable the default warning that is displayed on the DB Details Structure page if
 * any of the required Tables for the relationfeatures could not be found
 */
-$cfg['PmaNoRelation_DisableWarning']  = FALSE;
+$cfg['PmaNoRelation_DisableWarning']  = TRUE;

 /**
 * The 'cookie' auth_type uses blowfish algorithm to encrypt the password. If
@@ -42,7 +42,7 @@ $cfg['PmaNoRelation_DisableWarning']  = FALSE;
 * passphrase that will be used by blowfish. The maximum length seems to be 46
 * characters.
 */
-$cfg['blowfish_secret'] = '';
+$cfg['blowfish_secret'] = 'dolibarrblowfishkey';

 /**
 * Server(s) configuration
@@ -55,7 +55,7 @@ $i = 0;
 // full server array, just define values you need to change.
 $i++;
 $cfg['Servers'][$i]['host']          = 'localhost'; // MySQL hostname or IP address
-$cfg['Servers'][$i]['port']          = '3307';      // MySQL port - leave blank for default port
+$cfg['Servers'][$i]['port']          = 'WAMPMYSQLPORT';      // MySQL port - leave blank for default port
 $cfg['Servers'][$i]['socket']        = '';          // Path to the socket - leave blank for default socket
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['extension']     = 'mysqli';     // The php MySQL extension to use ('mysql' or 'mysqli')
@@ -111,6 +111,7 @@ $cfg['Servers'][$i]['AllowDeny']['order']           // Host authentication order
                                     = '';
 $cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
                                     = array();
+$cfg['Servers'][$i]['AllowNoPassword'] = true;

 // If you have more than one server configured, you can set $cfg['ServerDefault']
 // to any one of them to autoconnect to that server when phpMyAdmin is started,
--- a/build/exe/doliwamp/doliwamp.bmp
+++ b/build/exe/doliwamp/doliwamp.bmp
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -1,6 +1,6 @@
 ; ----- DoliWamp.iss ---------------------------------------------------------------------
 ; Script to build an auto installer for Dolibarr.
-; Works with InnoSetup 5.3.4 (a)
+; Works with InnoSetup 5.4.0 (a)
 ; Idea from WampServer 2 (http://www.wampserver.com)
 ;----------------------------------------------------------------------------------------
 ; You must edit some path in this file to build an exe (like SourceDir).
@@ -18,40 +18,64 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-2.8.0-beta
+AppVerName=DoliWamp-3.0.0
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-2.8.0-beta
+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=D:\Mes developpements\dolibarr
+SourceDir=C:\Work\Data\Workspace\dolibarr
 ; ----- End of change
+;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
 AppPublisher=NLTechno
 AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2010 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2011 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
-LicenseFile=COPYING
+;LicenseFile=COPYING
 ;Compression=none
 Compression=lzma
 SolidCompression=yes
 WizardImageFile=build\exe\doliwamp\doliwamp.bmp
 WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
 SetupIconFile=doc\images\dolibarr.ico
-PrivilegesRequired=poweruser
+PrivilegesRequired=admin
 DisableProgramGroupPage=yes
 ChangesEnvironment=no
 CreateUninstallRegKey=yes
+;UseSetupLdr=no
 ;UninstallDisplayIcon={app}\bidon
 OutputDir=build
+ShowLanguageDialog=auto
+ShowUndisplayableLanguages=no
+;LanguageDetectionMethod=none
+LanguageDetectionMethod=uilanguage
+;SignedUninstaller=yes
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl,build\exe\doliwamp\Languages\MyEnglish.isl"
+Name: "br"; MessagesFile: "compiler:Languages\Portuguese.isl,build\exe\doliwamp\Languages\MyBrazilianPortuguese.isl"
+Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl,build\exe\doliwamp\Languages\MyCatalan.isl"
+Name: "da"; MessagesFile: "compiler:Languages\Danish.isl,build\exe\doliwamp\Languages\MyDanish.isl"
+Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,build\exe\doliwamp\Languages\MySpanish.isl"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl,build\exe\doliwamp\Languages\MyDutch.isl"
+Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl,build\exe\doliwamp\Languages\MyFinnish.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl,build\exe\doliwamp\Languages\MyFrench.isl"
+Name: "ge"; MessagesFile: "compiler:Languages\German.isl,build\exe\doliwamp\Languages\MyGerman.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,build\exe\doliwamp\Languages\MyItalian.isl"
+Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl,build\exe\doliwamp\Languages\MyNorwegian.isl"
+Name: "po"; MessagesFile: "compiler:Languages\Polish.isl,build\exe\doliwamp\Languages\MyPolish.isl"
+Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl,build\exe\doliwamp\Languages\MyPortuguese.isl"
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,build\exe\doliwamp\Languages\MyRussian.isl"
+Name: "sv"; MessagesFile: "compiler:Languages\Slovenian.isl,build\exe\doliwamp\Languages\MySlovenian.isl"

 [Tasks]
 ;Name: "autostart"; Description: "Automatically launch DoliWamp server on startup. If you check this option, Services will be installed as automatic. Otherwise, services will be installed as manual and will start and stop with the service manager."; GroupDescription: "Auto Start:" ;Flags: unchecked;
-Name: quicklaunchicon; Description: "Create a &Quick Launch icon"; GroupDescription: "Additional icons:"; Flags: unchecked
-Name: "desktopicon"; Description: "Create a &Desktop icon"; GroupDescription: "Additional icons:"; Flags: unchecked
+Name: "quicklaunchicon"; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked

 [Dirs]
 Name: "{app}\logs"
@@ -76,14 +100,15 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-Source: "C:\Program Files (x86)\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 (x86)\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 (x86)\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 (x86)\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log"
+; 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:\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\mysql5.0.45\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
+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,telephonie\*,*\conf.php,*\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*,*\rodolphe"
+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,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"
@@ -135,6 +160,7 @@ var apachePort: String;
 var mysqlPort: String;
 var newPassword: String;

+var lockFile: String;
 var srcFile: String;
 var destFile: String;
 var srcFileH: String;
@@ -162,7 +188,7 @@ var value: String;
 //procedures lancees au debut de l'installation
 function InitializeSetup(): Boolean;
 begin
-  Result := MsgBox('You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.' #13#13 'This assistant installs or upgrades Dolibarr ERP-CRM and required third party softwares (Apache, Mysql and PHP) configured for a Dolibarr usage.' #13#13 'If you have technical knowledge and plan to share your Apache, Mysql and PHP with other projects than Dolibarr, you should not use this assistant and make a manual installation of Dolibarr on an existing Apache, Mysql and PHP installation. If you don''t need a sophisticated manual setup, you''re on the good way...' #13#13 'Do you want to start installation/upgrade process ?', mbConfirmation, MB_YESNO) = IDYES;
+  Result := MsgBox(CustomMessage('YouWillInstallDoliWamp')+#13#13+CustomMessage('ThisAssistantInstallOrUpgrade')+#13#13+CustomMessage('IfYouHaveTechnicalKnowledge')+#13#13+CustomMessage('ButIfYouLook')+#13#13+CustomMessage('DoYouWantToStart'), mbConfirmation, MB_YESNO) = IDYES;
 end;

 procedure InitializeWizard();
@@ -229,24 +255,24 @@ begin
  // Prepare an object calle "Page" of type wpInstalling.
  // Object will be show later in NextButtonClick function.
  Page := CreateInputQueryPage(wpInstalling,
-  'Technical parameters', '',
-  'If first install, please specify some technical parameters. If you don''t understand, are not sure, or are doing an upgrade, just leave the default values.');
+  CustomMessage('TechnicalParameters'), '',
+  CustomMessage('IfFirstInstall'));

  // TODO Add control differently if first install or update
  if firstinstall
  then
  begin
-    Page.Add('SMTP server (your own or ISP SMTP server, first install only) :', False);
-    Page.Add('Apache port (first install only, common choice is 80) :', False);
-    Page.Add('Mysql port (first install only, common choice is 3306) :', False);
-    Page.Add('Mysql server and database password you want for root (first install only):', False);
+    Page.Add(CustomMessage('SMTPServer'), False);
+    Page.Add(CustomMessage('ApachePort'), False);
+    Page.Add(CustomMessage('MySqlPort'), False);
+    Page.Add(CustomMessage('MySqlPassword'), False);
  end
  else
  begin
-    Page.Add('SMTP server (your own or ISP SMTP server, first install only) :', False);
-    Page.Add('Apache port (first install only, common choice is 80) :', False);
-    Page.Add('Mysql port (first install only, common choice is 3306) :', False);
-    Page.Add('Mysql server and database password you want for root (first install only):', False);
+    Page.Add(CustomMessage('SMTPServer'), False);
+    Page.Add(CustomMessage('ApachePort'), False);
+    Page.Add(CustomMessage('MySqlPort'), False);
+    Page.Add(CustomMessage('MySqlPassword'), False);
  end;
  
  // Default values
@@ -282,6 +308,10 @@ function NextButtonClick(CurPageID: Integer): Boolean;
 var myResult: Integer;
 var res: Boolean;
 var paramok: Boolean;
+var datadirold: String;
+var datadirnew: String;
+var exedirold: String;
+var exedirnew: String;
 var themessage: String;
 begin

@@ -292,13 +322,42 @@ begin
  if CurPageID = Page.ID then
  begin

-
    // This must be in if curpage.id = page.id, otherwise it is executed after each Next button

-    //----------------------------------------------
-    // copie des dll de php vers apache
-    //----------------------------------------------
+    path := ExpandConstant('{app}');
+    winPath := ExpandConstant('{win}');
+    pathWithSlashes := path;
+    StringChange (pathWithSlashes, '\','/');
+    datadirold := pathWithSlashes+'/bin/mysql/mysql5.0.45/data';
+    datadirnew := pathWithSlashes+'/bin/mysql/data';
+    exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
+    exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';

+    // If we have a new database version, we should only copy old my.ini file into new directory
+    // and change only all basedir= strings to use new version. Like this, data dir is still correct.
+    // Install of service and stop/start scripts are already rebuild by installer.
+//      FileCopy(exedirold+'/my.ini',exedirnew+'/my.ini', true);
+
+//    We should not need this, also databases may not be called dolibarr
+//      res := RenameFile(ibdata1dirold+'/dolibarr',ibdata1dirnew+'/dolibarr');
+//      if res then
+//      begin
+//          themessage := CustomMessage('OldVersionFoundAndMoveInNew');
+//          MsgBox(themessage,mbInformation,MB_OK);
+//          TODO Replace also mysql.ini and resintall service
+//      end
+//      else
+//      begin
+//          themessage := CustomMessage('OldVersionFoundButFailedToMoveInNew');
+//          MsgBox(themessage,mbInformation,MB_OK);
+//      end;
+
+
+    //----------------------------------------------
+    // Copie des dll de php vers apache
+    //----------------------------------------------
+	// TODO Update this list when changing PHP/Apache versions
+	
    phpDllCopy := 'fdftk.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'fribidi.dll';
@@ -311,31 +370,39 @@ begin
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'libmysql.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'libpq.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'msql.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'libmcrypt.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'libmysqli.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'ntwdblib.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+
    phpDllCopy := 'php5activescript.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'php5isapi.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'php5nsapi.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'php5ts.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+
    phpDllCopy := 'ssleay32.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
    phpDllCopy := 'yaz.dll';
    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmcrypt.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php5ts.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);


    // Remove lock file
-    DeleteFile(pathWithSlashes+'/www/dolibarr/install.lock');
-
+    lockfile := pathWithSlashes+'/www/dolibarr/install.lock';
+    if FileExists (lockfile) and not DeleteFile(lockfile) then
+    begin
+      themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
+ 		  MsgBox(themessage,mbInformation,MB_OK);
+    end


 		// Check if parameters already defined in conf.php file
@@ -382,7 +449,7 @@ begin
 //  		    paramok := False;
 //  		  end;
 //	    end;
-	    
+	
      if paramok then
      begin
  		  // Test port Apache
@@ -390,7 +457,7 @@ begin
    		//MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
    		Exec(batFile, '-s localhost -p '+myporta, path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
        //themessage := 'Le port '+myporta+' semble deja pris. Revenez en arriere pour choisir une autre valeur pour le port Apache.';
-        themessage := 'Port '+myporta+' seems to be already in use. Go back to choose another value for Apache port. Cancel choice and choose another value ?';
+        themessage := FmtMessage(CustomMessage('PortAlreadyInUse'),[myporta,'Apache']);
    		if ((IntToStr(myResult) = '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
        begin
    		  paramok := False;
@@ -404,7 +471,7 @@ begin
    		//MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
    		Exec(batFile, '-s localhost -p '+myport, path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
        //themessage := 'Le port '+myport+' semble deja pris. Revenez en arriere pour choisir une autre valeur pour le port MySQL.';
-        themessage := 'Port '+myport+' seems to be already in use. Go back to choose another value for MySQL port. Cancel choice and choose another value ?';
+        themessage := FmtMessage(CustomMessage('PortAlreadyInUse'),[myport,'MySql']);
    		if ((IntToStr(myResult) = '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
    		begin
      		paramok := False;
@@ -458,37 +525,37 @@ begin
 	      browser := 'iexplore.exe';
 	      if FileExists (pfPath+'/Mozilla Firefox/firefox.exe')  then
 	      begin
-	        if MsgBox('Firefox has been detected on your computer. Would you like to use it as the default browser with Dolibarr ?',mbConfirmation,MB_YESNO) = IDYES then
+	        if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
 	        begin
 	          browser := pfPath+'/Mozilla Firefox/firefox.exe';
 	        end;
 	      end;
 	      if browser = 'iexplore.exe' then
 	      begin
-	        GetOpenFileName('Please choose your default browser. If you are not sure, just click Open :', browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
+	        GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
 	      end;
 	
 	      LoadStringFromFile (srcFile, srcContents);
-	      StringChange (srcContents, 'WAMPBROWSER', browser);
-	      StringChange (srcContents, 'WAMPAPACHEPORT', myporta);
-	      StringChange (srcContents, 'WAMPAPACHEPSSL', myportas);
+	      StringChangeEx (srcContents, 'WAMPBROWSER', browser, True);
+	      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
+	      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 	      SaveStringToFile(destFile,srcContents, False);
 	
 	      LoadStringFromFile (srcFileH, srcContents);
-	      StringChange (srcContents, 'WAMPBROWSER', browser);
-	      StringChange (srcContents, 'WAMPAPACHEPORT', myporta);
-	      StringChange (srcContents, 'WAMPAPACHEPSSL', myportas);
+	      StringChangeEx (srcContents, 'WAMPBROWSER', browser, True);
+	      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
+	      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 	      SaveStringToFile(destFileH,srcContents, False);
 	
 	      LoadStringFromFile (srcFileA, srcContents);
-	      StringChange (srcContents, 'WAMPBROWSER', browser);
-	      StringChange (srcContents, 'WAMPAPACHEPORT', myporta);
-	      StringChange (srcContents, 'WAMPAPACHEPSSL', myportas);
+	      StringChangeEx (srcContents, 'WAMPBROWSER', browser, True);
+	      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
+	      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 	      SaveStringToFile(destFileA,srcContents, False);
 	    end


-      if MsgBox('DoliWamp installer will now start or restart Apache and Mysql, this may last from several seconds to one minute after this confirmation. Start to install or upgrade the web server and database server ?',mbConfirmation,MB_YESNO) = IDYES then
+      if MsgBox(CustomMessage('DoliWampWillStartApacheMysql'),mbConfirmation,MB_YESNO) = IDYES then
      begin

 		
@@ -504,8 +571,8 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //installDir et version de phpmyadmin
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -524,8 +591,8 @@ begin
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile, srcContents, False);
 		    end
@@ -545,7 +612,8 @@ begin
 		    begin
 	        // sinon on prends le fichier par defaut
 	        LoadStringFromFile (srcFile, srcContents);
-	        StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass);
+	        StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+	        StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 	        SaveStringToFile(destFile,srcContents, False);
 		    end
 		
@@ -563,10 +631,10 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //installDir et version de php
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPPHPVERSION', phpVersion);
-		      StringChange (srcContents, 'WAMPAPACHEPORT', myporta);
-		      StringChange (srcContents, 'WAMPAPACHEPSSL', myportas);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -586,8 +654,8 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //installDir et version de php
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPMYSQLPORT', myport);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -605,22 +673,22 @@ begin
 		    if not FileExists (destFile) then
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
-		      StringChange (srcContents, 'WAMPPHPVERSION', phpVersion);
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
-		      StringChange (srcContents, 'WAMPAPACHEPORT', myporta);
-		      StringChange (srcContents, 'WAMPAPACHEPSSL', myportas);
+		      StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		      SaveStringToFile(destFile, srcContents, False);
 		    end
 		    else
 		    begin
 		      RenameFile(destFile, destFile+'.old');
 		      LoadStringFromFile (srcFile, srcContents);
-		      StringChange (srcContents, 'WAMPPHPVERSION', phpVersion);
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
-		      StringChange (srcContents, 'WAMPAPACHEPORT', myporta);
-		      StringChange (srcContents, 'WAMPAPACHEPSSL', myportas);
+		      StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		      SaveStringToFile(destFile, srcContents, False);
 		    end
 		
@@ -639,10 +707,10 @@ begin
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPMYSQLPORT', myport);
-		      StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -661,8 +729,8 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -681,8 +749,8 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -702,8 +770,8 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -722,9 +790,9 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPMYSQLPORT', myport);
-		      StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -742,10 +810,10 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPMYSQLPORT', myport);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -763,10 +831,10 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
-		      StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
-		      StringChange (srcContents, 'WAMPMYSQLPORT', myport);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -784,8 +852,8 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -801,8 +869,8 @@ begin
 		    if not FileExists (destFile) and FileExists(srcFile) then
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPSMTP', mysmtp);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
 		
@@ -816,8 +884,8 @@ begin
 		    if not FileExists (destFile) and FileExists(srcFile) then
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
-		      StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
-		      StringChange (srcContents, 'WAMPSMTP', mysmtp);
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
 		
@@ -914,13 +982,13 @@ begin
  pathWithSlashes := path;
  StringChange (pathWithSlashes, '\','/');

-  MsgBox('Dolibarr program files have been removed. However, all your old data files are still in directory '+path+'. You must remove this directory manually for a complete uninstall.',mbInformation,MB_OK);
+  MsgBox(FmtMessage(CustomMessage('ProgramHasBeenRemoved'),[path]),mbInformation,MB_OK);
 end;


 [Run]
 ; Launch Dolibarr in browser. This is run after Wizard because of postinstall flag
-Filename: "{app}\rundoliwamp.bat"; Description: "Launch Dolibarr now"; Flags: shellexec postinstall skipifsilent runhidden
+Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec postinstall skipifsilent runhidden


 [UninstallDelete]
@@ -941,3 +1009,5 @@ Type: filesandordirs; Name: "{app}\www\dolibarr"
 [UninstallRun]
 Filename: "{app}\uninstall_services.bat"; Flags: runhidden

+
+
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -86,7 +86,7 @@ LoadModule cgi_module modules/mod_cgi.so
 #LoadModule deflate_module modules/mod_deflate.so
 LoadModule dir_module modules/mod_dir.so
 LoadModule env_module modules/mod_env.so
-#LoadModule expires_module modules/mod_expires.so
+LoadModule expires_module modules/mod_expires.so
 #LoadModule file_cache_module modules/mod_file_cache.so
 #LoadModule headers_module modules/mod_headers.so
 LoadModule imagemap_module modules/mod_imagemap.so
@@ -741,19 +741,20 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 #AddEncoding gzip .jgz

 # OPTIMIZE: To use gzip compression (on the fly).
-# Note that you must also enable the module mod_deflate 
+# 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.
-# Note that you must also enable the module mod_expires
+# Note that you must also enable the module mod_expires.
 #ExpiresActive On
-#ExpiresByType image/gif A86400
-#ExpiresByType image/png A86400
-#ExpiresByType image/jpeg A86400
-#ExpiresByType text/html A86400
-#ExpiresByType text/css A86400
-#ExpiresByType text/javascript A86400
-#ExpiresByType application/x-javascript A86400
+#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


 # Declare alias for Dolibarr, PHPMyAdmin and other softwares
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -12,5 +12,5 @@ $force_install_databaserootlogin='root';
 $force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
-$force_install_lockinstall='1';
+$force_install_lockinstall='644';
 ?>
--- a/build/exe/doliwamp/install_services.bat.install
+++ b/build/exe/doliwamp/install_services.bat.install
@@ -4,10 +4,18 @@ REM This script install Apache and Mysql DoliWamp services
 REM --------------------------------------------------------

 echo ---- Execute install_services.bat >> doliwamp.log 2>>&1
+
 REM NET STOP doliwampapache
 REM NET STOP doliwampmysqld 
+
+REM Apache x.x
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
+
+REM Mysql 5.0-
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld
 .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld
+REM Mysql 5.1+
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
+
 echo ---- End script >> doliwamp.log 2>>&1
--- a/build/exe/doliwamp/my.ini.install
+++ b/build/exe/doliwamp/my.ini.install
@@ -75,7 +75,7 @@ basedir=WAMPROOT/bin/mysql/mysql5.0.45
 log-error=WAMPROOT/logs/mysql.log

 #Path to the database root
-datadir=WAMPROOT/bin/mysql/mysql5.0.45/data
+datadir=WAMPROOT/bin/mysql/data

 # The default character set that will be used when a new schema or table is
 # created and no character set is defined
@@ -232,7 +232,7 @@ basedir=WAMPROOT/bin/mysql/mysql5.0.45
 log-error=WAMPROOT/logs/mysql.log

 #Path to the database root
-datadir=WAMPROOT/bin/mysql/mysql5.0.45/data
+datadir=WAMPROOT/bin/mysql/data

 # The default character set that will be used when a new schema or table is
 # created and no character set is defined
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -686,11 +686,11 @@ extension=php_pdo_mysql.dll
 ;extension=php_pdo_odbc.dll
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
-;extension=php_pgsql.dll
+extension=php_pgsql.dll
 ;extension=php_pspell.dll
 extension=php_shmop.dll
 ;extension=php_snmp.dll
-;extension=php_soap.dll
+extension=php_soap.dll
 extension=php_sockets.dll
 extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
--- a/build/exe/doliwamp/rundoliadmin.bat.install
+++ b/build/exe/doliwamp/rundoliadmin.bat.install
@@ -3,4 +3,4 @@ REM Launch Dolibarr Admin center
 REM ----------------------------

 REM Go to admin center page
-start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/
+start "DoliWamp admin" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/
--- a/build/exe/doliwamp/rundolihelp.bat.install
+++ b/build/exe/doliwamp/rundolihelp.bat.install
@@ -4,4 +4,4 @@ REM ---------------------------

 REM Go to help center page
 echo Please wait...
-start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
+start "Dolibarr Help center" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
--- 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 www\dolibarr\install.lock start "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 www\dolibarr\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/
+IF EXIST www\dolibarr\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/
--- a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
+++ b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
@@ -6,12 +6,12 @@ REM Microsoft add bugs in service packs that prevents
 REM servers ran as a service to launch.
 REM -----------------------------------------------------

-echo Running Apache
-WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k start
+echo Running Apache as user process (this process does not return so we use "start")
+start WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -f conf\httpd.conf

 echo 

-echo Running Mysql
-WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini
+echo Running Mysql as user process (this process does not return so we use "start")
+start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console

 pause
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -3,15 +3,15 @@
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe)
 # \version      $Revision$
-# \author       (c)2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

 use Cwd;

 $PROJECT="dolibarr";
-$MAJOR="2";
-$MINOR="8";
-$BUILD="0-beta";				# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$MAJOR="3";
+$MINOR="0";
+$BUILD="0";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="1";		# A incrementer au moment de la release

@LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -104,6 +104,10 @@ my $batch=0;
 for (0..@ARGV-1) {
 	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
 	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
+    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+    	$PREFIX=$1; 
+    	$FILENAMESNAPSHOT.="-".$PREFIX; 
+    }
 }

 print "Makepack version $VERSION\n";
@@ -215,9 +219,11 @@ if ($nboftargetok) {
    if ($nboftargetneedcvs)
 	{
    	print "Go to directory $SOURCE\n";
+   		$olddir=getcwd();
   		chdir("$SOURCE");
    	print "Run cvs update -P -d\n";
    	$ret=`cvs update -P -d 2>&1`;
+    	chdir("$olddir");
 	}
 	
    # Update buildroot if required
@@ -229,19 +235,26 @@ if ($nboftargetok) {
 	    	$ret=`rm -fr "$BUILDROOT"`;
 	    
 	    	mkdir "$BUILDROOT";
-	    	mkdir "$BUILDROOT/dolibarr";
-	    	print "Copy $SOURCE into $BUILDROOT/dolibarr\n";
-	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/dolibarr"`;
+	    	mkdir "$BUILDROOT/$PROJECT";
+	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
+	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
 	    }
 	    print "Clean $BUILDROOT\n";
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
 	}
@@ -256,11 +269,11 @@ if ($nboftargetok) {
    	if ($target eq 'SNAPSHOT') {
    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMESNAPSHOT");
-    		unlink("$FILENAMESNAPSHOT.tgz");
+    		unlink("$DESTI/$FILENAMESNAPSHOT.tgz");

    		print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
   		    #$cmd="tar --exclude \"$BUILDROOT/tgz/tar_exclude.txt\" --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
-   		    $cmd="tar --exclude .cache --exclude .settings --exclude conf.php --directory \"$BUILDROOT\" -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+   		    $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
 			print $cmd."\n";
 			$ret=`$cmd`;
            if ($OS =~ /windows/i)
@@ -279,9 +292,10 @@ if ($nboftargetok) {
    	if ($target eq 'TGZ') {
    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
+    		print "Remove target $FILENAMETGZ.tgz...\n";
    		unlink("$FILENAMETGZ.tgz");
    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
+   		    $cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
   		    $ret=`$cmd`;
            if ($OS =~ /windows/i)
            {
@@ -290,28 +304,36 @@ if ($nboftargetok) {
            }
            else
            {
+                print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
        		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
            }
    		next;
    	}

    	if ($target eq 'ZIP') {
-    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
-			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
-    		unlink("$FILENAMEZIP.zip");
-    		print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
+			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMEZIP");
+    		unlink("$DESTI/$FILENAMEZIP.zip");
+    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
 
-     		print "Go to directory $BUILDROOT\n";
+            print "Go to directory $BUILDROOT\n";
+     		$olddir=getcwd();
     		chdir("$BUILDROOT");
- 
-    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMETGZ\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*";
+    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\\*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-			#print $ret;
-			#print "Go to directory $DESTI\n";
-     		#chdir("$DESTI");
-			print "Move $FILENAMEZIP.zip to $DESTI\n";
-    		rename("$BUILDROOT/$FILENAMEZIP.zip","$DESTI/$FILENAMEZIP.zip");
+            chdir("$olddir");
+            			
+            if ($OS =~ /windows/i)
+            {
+                print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
+                $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
+            }
+            else
+            {
+                print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
+                $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
+            }
    		next;
    	}
    
@@ -321,7 +343,7 @@ if ($nboftargetok) {
 			
    		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
-    		unlink("$FILENAMETGZ.tgz");
+    		unlink("$DESTI/$FILENAMETGZ.tgz");
    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;

@@ -350,6 +372,7 @@ if ($nboftargetok) {
    	}
    	
    	if ($target eq 'DEB') {
+    		unlink("$DESTI/$FILENAMEDEB.deb");
 			
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;

@@ -380,30 +403,55 @@ if ($nboftargetok) {
 		    $ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.tgz`;
 		    $ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.zip`;
 		    $ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/dolibarr-*.deb`;
+		    $ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/doxygen/doxygen_warnings.log`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/dbmodel`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/fpdf`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/initdata`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/iso-normes`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/phpcheckstyle`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/phpunit`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/spec`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/uml`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/dev/xdebug`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/flyer`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/font`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/tshirt`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/doc/rollup`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.old`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/test`;
+            # To remove once stable
+            $ret=`rm -f $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/incluces/modules/facture/doc/doc_generic_invoice_odt.modules.php`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;

 			print "Edit version in file $BUILDROOT/$PROJECT/DEBIAN/control\n";
            open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error";
            open (SPECTO,">$BUILDROOT/$PROJECT/DEBIAN/control") || die "Error";
            while (<SPECFROM>) {
            	$newbuild = $BUILD;
-                $newbuild =~ s/dev/0/gi;
-                $newbuild =~ s/alpha/0/gi;
-                $newbuild =~ s/beta/1/gi;
-                if ($newbuild !~ /-/) { $newbuild.='-2'; }
+                $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+                $newbuild =~ s/beta/1/gi;						# beta
+                $newbuild =~ s/rc./2/gi;						# rc
+                if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
                print SPECTO $_;
            }
            close SPECFROM;
            close SPECTO;
+			print "Version set to $MAJOR.$MINOR.$newbuild\n";
+			
+	   		print "Create directory $BUILDROOT/$PROJECT/usr/share/applications\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/applications"`;
+    		print "Copy desktop file into $BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop\n";
+    		$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT/usr/share/applications/dolibarr.desktop"`;

-    		print "Create directory $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents\n";
-    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/$PROJECT/documents"`;
+	   		print "Create directory $BUILDROOT/$PROJECT/usr/share/pixmaps\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/pixmaps"`;
+    		print "Copy pixmap file into $BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm\n";
+    		$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$PROJECT/usr/share/pixmaps/dolibarr.xpm"`;

    		#print "Create directory $BUILDROOT/$PROJECT/etc/$PROJECT\n";
    		#$ret=`mkdir -p "$BUILDROOT/$PROJECT/etc/$PROJECT"`;
@@ -420,25 +468,42 @@ if ($nboftargetok) {
    		#print "Copy apache conf file into $BUILDROOT/$PROJECT/etc/$PROJECT\n";
    		#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT/etc/$PROJECT"`;

+    		print "Create directory $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT/usr/share/$PROJECT/documents"`;
+
 			print "Set permissions/owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT`;
 		    $ret=`chown -R www-data.www-data $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;
 		    $ret=`chmod -R 555 $BUILDROOT/$PROJECT`;
+		    $ret=`chmod 755 $BUILDROOT/$PROJECT`;
 		    $ret=`chmod -R 755 $BUILDROOT/$PROJECT/usr/share/$PROJECT/documents`;
 		    $ret=`chmod -R 755 $BUILDROOT/$PROJECT/DEBIAN`;

     		print "Go to directory $BUILDROOT\n";
+            $olddir=getcwd();
     		chdir("$BUILDROOT");
 
    		$cmd="dpkg -b $BUILDROOT/$PROJECT $BUILDROOT/${FILENAMEDEB}.deb";
    		print "Launch DEB build ($cmd)\n";
    		$ret=`$cmd`;
    		print $ret."\n";
+            chdir("$olddir");
+    		
+            if ($OS =~ /windows/i)
+            {
+                print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
+                $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
+            }
+            else
+            {
+                print "Move ${FILENAMEDEB}.deb to $BUILDROOT/${FILENAMEDEB}.deb\n";
+                $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
+            }
        	next;
        }
        
    	if ($target eq 'EXE') {
-    		unlink "$FILENAMEEXE.exe";
+    		unlink "$DESTI/$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";
@@ -450,7 +515,7 @@ if ($nboftargetok) {
    
    	if ($target eq 'EXEDOLIWAMP') 
    	{
-    		unlink "$FILENAMEEXEDOLIWAMP.exe";
+    		unlink "$DESTI/$FILENAMEEXEDOLIWAMP.exe";
    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
    		$cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"";
 			print "$cmd\n";
--- a/build/makepack-dolibarrlang.pl
+++ b/build/makepack-dolibarrlang.pl
@@ -78,7 +78,7 @@ print "Makepack langs version $VERSION\n";
 print "Enter language code to package (en_US, fr_FR, ...) : ";
 $PROJECT=<STDIN>;
 chomp($PROJECT);
-# \todo Autodetect version
+# TODO Autodetect version
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
@@ -224,9 +224,9 @@ if ($nboftargetok) {
    		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\" -czvf \"$FILENAMETGZ.tgz\" htdocs";
+   		    $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\" -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
+#        	$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";
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -13,6 +13,7 @@ $PROJECT="mymodule";
@LISTETARGET=("TGZ");   # Possible packages
 %REQUIREMENTTARGET=(    # Tool requirement for each package
 "TGZ"=>"tar",
+"ZIP"=>"7z"
 );
 %ALTERNATEPATH=(
 );
@@ -68,183 +69,286 @@ $BUILDROOT="$TEMP/dolibarr-buildroot";
 my $copyalreadydone=0;
 my $batch=0;

-print "Makepack module version $VERSION\n";
-print "Enter name for your module (mymodule, mywonderfulmondule, ...) : ";
-$PROJECT=<STDIN>;
-chomp($PROJECT);
-print "Move to ".$DIR." directory.\n";
-chdir($DIR);
-
-if (! -f "makepack-".$PROJECT.".conf")
-{
-    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
-	print "Check that current directory is 'build' directory\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-    exit 2;
+for (0..@ARGV-1) {
+	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
+	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
+    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+    	$PREFIX=$1; 
+    	$FILENAMESNAPSHOT.="-".$PREFIX; 
+    }
 }
+
+print "Makepack for modules version $VERSION\n";
+
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
 chomp($PROJVERSION);
-($MAJOR,$MINOR)=split(/\./,$PROJVERSION,2);
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
 if ($MINOR eq '')
 {
-	print "Enter value for minor version: ";
-	$MINOR=<STDIN>;
-	chomp($MINOR);
+    print "Enter value for minor version: ";
+    $MINOR=<STDIN>;
+    chomp($MINOR);
 }

-$FILENAME="$PROJECT";
-$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR";
-if (-d "/usr/src/redhat") {
-    # redhat
-    $RPMDIR="/usr/src/redhat";
-}
-if (-d "/usr/src/RPM") {
-    # mandrake
-    $RPMDIR="/usr/src/RPM";
-}
+# Ask module
+print "Enter name for your module (mymodule, mywonderfulmondule, ...) : ";
+$PROJECTINPUT=<STDIN>;
+chomp($PROJECTINPUT);
+print "Move to ".$DIR." directory.\n";
+chdir($DIR);

 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";

+print "Source directory: $SOURCE\n";
+print "Target directory: $DESTI\n";

-# Choose package targets
-#-----------------------
-$target="TGZ";    # Dolibarr modules are tgz format
-$CHOOSEDTARGET{uc($target)}=1;
-
-
-# Test if requirement is ok
-#--------------------------
-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";
-        }    
-
-        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";
-        }
+my @PROJECTLIST=();
+if ($PROJECTINPUT eq "all")
+{
+    opendir(DIR, $DIR) || return;
+    local @rv = grep { /^makepack\-(.*)\.conf$/ } sort readdir(DIR);
+    closedir(DIR);
+    foreach my $xxx (0..@rv-1) {
+    	if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/)
+    	{ 
+    	   @PROJECTLIST[$xxx]=$1;
+    	}
    }
 }
-
-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++;
+else
+{
+	@PROJECTLIST=($PROJECTINPUT);
 }

-if ($nboftargetok) {

-    # Update buildroot
-    #-----------------
-    if (! $copyalreadydone) {
-    	print "Delete directory $BUILDROOT\n";
-    	$ret=`rm -fr "$BUILDROOT"`;
-    	mkdir "$BUILDROOT";
-    	
-		$result=open(IN,"<makepack-".$PROJECT.".conf");
-		if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
-	    while(<IN>)
-	    {
-	    	if ($_ =~ /^#/) { next; }	# Do not process comments
-			
-			$_ =~ s/\n//;
-	    	$_ =~ /^(.*)\/[^\/]+/;
-	    	print "Create directory $BUILDROOT/$1\n";
-	    	$ret=`mkdir -p "$BUILDROOT/$1"`;
-	    	print "Copy $SOURCE/$_ into $BUILDROOT/$_\n";
-    		$ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$_"`;
-		}	
-		close IN;
+# Loop on each projects
+foreach my $PROJECT (@PROJECTLIST) {
+	
+	if (! -f "makepack-".$PROJECT.".conf")
+	{
+	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
+		print "\n";
+		print "For help on building a module package, see web page\n";
+		print "http://wiki.dolibarr.org/index.php/Module_development#Create_a_package_to_distribute_and_install_your_module\n";
+		print "makepack-dolibarrmodule.pl aborted.\n";
+	    sleep 2;
+	    exit 2;
+	}
+	
+	$FILENAME="$PROJECT";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR";
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR";
+	if (-d "/usr/src/redhat") {
+	    # redhat
+	    $RPMDIR="/usr/src/redhat";
+	}
+	if (-d "/usr/src/RPM") {
+	    # mandrake
+	    $RPMDIR="/usr/src/RPM";
+	}
+	
+	
+	# Choose package targets
+	#-----------------------
+	$target="ZIP";    # Dolibarr modules are this format
+	$CHOOSEDTARGET{uc($target)}=1;
+	
+	
+	# Test if requirement is ok
+	#--------------------------
+	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";
+	        }    
+	
+	        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;
+	$nboftargetneedbuildroot=0;
+	$nboftargetneedcvs=0;
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    if ($CHOOSEDTARGET{$target} < 0) { next; }
+		if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
+		{
+			$nboftargetneedbuildroot++;
+		}
+		if ($target eq 'SNAPSHOT')
+		{
+			$nboftargetneedcvs++;
+		}
+		$nboftargetok++;
+	}
+	
+	if ($nboftargetok) {
+	
+	    # Update CVS if required
+	    #-----------------------
+	    if ($nboftargetneedcvs)
+		{
+	    	print "Go to directory $SOURCE\n";
+	   		$olddir=getcwd();
+	   		chdir("$SOURCE");
+	    	print "Run cvs update -P -d\n";
+	    	$ret=`cvs update -P -d 2>&1`;
+	    	chdir("$olddir");
+		}
 		
-		@timearray=localtime(time());
-		$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-		$versionfile=open(VF,">$BUILDROOT/build/version-".$PROJECT.".txt");
+	    # Update buildroot if required
+	    #-----------------------------
+	    if ($nboftargetneedbuildroot)
+		{
+		    if (! $copyalreadydone) {
+		    	print "Delete directory $BUILDROOT\n";
+		    	$ret=`rm -fr "$BUILDROOT"`;
+	
+		    	mkdir "$BUILDROOT";
+		    	mkdir "$BUILDROOT/$PROJECT";
+		    	
+				$result=open(IN,"<makepack-".$PROJECT.".conf");
+				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
+			    while(<IN>)
+			    {
+			    	if ($_ =~ /^#/) { next; }	# Do not process comments
+					
+					$_ =~ s/\n//;
+			    	$_ =~ /^(.*)\/[^\/]+/;
+			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
+			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
+			    	if ($_ !~ /version\-/)
+			    	{
+			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
+		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
+			    	}
+				}	
+				close IN;
+				
+				@timearray=localtime(time());
+				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
+				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
+		
+				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
+				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
+				print VF "Version: ".$MAJOR.".".$MINOR."\n";
+				print VF "Build  : ".$fulldate."\n";
+				close VF;
+		    }
+		    print "Clean $BUILDROOT\n";
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
+		}    
+	    
+	    # Build package for each target
+	    #------------------------------
+	    foreach my $target (keys %CHOOSEDTARGET) {
+	        if ($CHOOSEDTARGET{$target} < 0) { next; }
+	    
+	        print "\nBuild package for target $target\n";
+	        
+	    	if ($target eq 'TGZ') {
+	    		print "Remove target $FILENAMETGZ.tgz...\n";
+	    		unlink("$DESTI/$FILENAMETGZ.tgz");
+	    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
+	   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
+	   		    $ret=`$cmd`;
+	            if ($OS =~ /windows/i) {
+	        		print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
+	        		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+	            }
+	            else
+	            {
+	        		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+	            }
+	            next;
+	    	}
+	
+	    	if ($target eq 'ZIP') {
+	    		print "Remove target $FILENAMEZIP.zip...\n";
+	    		unlink "$DESTI/$FILENAMEZIP.zip";
+	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
+	
+	            print "Go to directory $BUILDROOT/$PROJECT\n";
+	     		$olddir=getcwd();
+	     		chdir("$BUILDROOT/$PROJECT");
+	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
+				print $cmd."\n";
+				$ret= `$cmd`;
+	            chdir("$olddir");
+	
+	            print "Move $FILENAMEZIP.zip to $DESTI/$FILENAMEZIP.zip\n";
+	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`;
+	    		next;
+	    	}
+	    
+	    	if ($target eq 'EXE') {
+	    		print "Remove target $FILENAMEEXE.exe...\n";
+	    		unlink "$DESTI/$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 "\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 successfully in $DESTI\n";
+	    }
+	}

-		print "Create version file $BUILDROOT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
-		$ret=`mkdir -p "$BUILDROOT/build"`;
-		print VF "Version: ".$MAJOR.".".$MINOR."\n";
-		print VF "Build  : ".$fulldate."\n";
-		close VF;
-    }
-    
-    
-    # Build package for each target
-    #------------------------------
-    foreach my $target (keys %CHOOSEDTARGET) {
-        if ($CHOOSEDTARGET{$target} < 0) { next; }
-    
-        print "\nBuild package for target $target\n";
-        
-    	if ($target eq 'TGZ') {
-    		unlink $FILENAMETGZ.tgz;
-    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --directory \"$BUILDROOT\" -czvf \"$FILENAMETGZ.tgz\" .";
-   		    $ret=`$cmd`;
-            if ($OS =~ /windows/i) {
-        		print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
-        		$ret=`mv "$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 '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 "\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 successfully in $DESTI\n";
-    }
-}

-if (! $btach) {
+if (! $batch) {
    print "\nPress key to finish...";
    my $WAITKEY=<STDIN>;
 }
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -78,7 +78,7 @@ print "Makepack theme version $VERSION\n";
 print "Enter name of theme to package: ";
 $PROJECT=<STDIN>;
 chomp($PROJECT);
-# \todo Autodetect version
+# TODO Autodetect version
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
@@ -224,9 +224,9 @@ if ($nboftargetok) {
    		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\" -czvf \"$FILENAMETGZ.tgz\" htdocs";
+   		    $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\" -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
+#        	$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";
@@ -252,7 +252,7 @@ if ($nboftargetok) {
    		$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" -czvf "$BUILDROOT/$FILENAMETGZ.tgz" $FILENAMETGZ`;
+    		$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\"";
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -1,30 +1,60 @@
-***** Actions to do to release *****
+----- Dolibarr Makepack How To -----
+This documentation describe steps to build a BETA or RELEASE versions
+of Dolibarr. There is a chapter for BETA version and a chapter for 
+RELEASE version.
+
+***** Actions to do a BETA *****
+This files describe steps made by Dolibarr packaging team to make a 
+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-y in build/makepack-dolibarr.pl
+- 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
+- Commit all changes.
+- Add a CVS Tag (DOLIBARR_x_y_BETA)
+- If it's a new branch (Vx.y), create a branch (DOLIBARR_x_y_BRANCH).
+
+- 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.
+
+- Send mail on mailings-list
+
+
+***** Actions to do a RELEASE *****
 This files describe steps made by Dolibarr packaging team to make a 
 complete release of Dolibarr, step by step.

 - Check all files are commited.
- Update files in root directory (README*.txt, ChangeLog...)
- Update version number in build/makepack-dolibarr.pl
- Update version number in build/doxygen/dolibarr-doxygen.doxyfile
- Update version number in build/exe/doliwamp/doliwamp.iss
- Update version number in build/perl/virtualmin/dolibarr.pl
- Update version number in htdocs/master.inc.php
- Update version number in htdocs/install/inc.php
+- Update version/info in / directory (README*.txt, ChangeLog...)
+- Update version number with x.x.x-y in build/makepack-dolibarr.pl
+- 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 PAD and DOAP files.
 - Commit all changes.
- Add a CVS Tag
- If it's a new branch (Vx.y), create a branch.
+- Add a CVS Tag (DOLIBARR_x_y)

 - Build Dolibarr and DoliWamp with makepack-dolibarr.pl
 - Check content of built packages.
- Move build files (tgz+exe), ChangeLog and PAD/DOAP files into Dolibarr
-  web site repository /home/dolibarr/wwwroot/files.
- Move links in directory "/home/dolibarr/wwwroot/files" on server to point
-  to new files.
- Upload NLTechno web page with DoliWamp version.
+- 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.
+- Update and upload NLTechno web page with DoliWamp version.

 - Upload files dolibarr.*.tgz and doliwamp.*.exe on sourceforge.
- Update entries on joomla web site www.dolibarr.org with new sourceforge link.
+- 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
@@ -1,181 +1,186 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_PML>
-	<AppVerInfo>PADGen 3.1.0.41</AppVerInfo>
-	<CompanyName />
-	<Program_Info>
-		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>2.8.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
-		<Program_Release_Year>2010</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<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_Language>English,Catalan,Dutch,French,German,Italian,Norwegian,Portuguese,Spanish</Program_Language>
-		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>26048004</File_Size_Bytes>
-			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>24.84</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>doliwamp, dolibarr, erp, crm, management, company, accounting</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your companyfoundation</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 medium company 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 medium companies, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. It's an 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.
-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.
-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 use, Simple to develop. 
-</Char_Desc_2000>
-		</English>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
-			<Application_Order_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</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_doliwamp.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<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>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://www.asp-shareware.org/pad/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<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_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
-</PADGEN_PML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_PML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<CompanyName />
+	<Program_Info>
+		<Program_Name>DoliWamp</Program_Name>
+		<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 />
+		<Program_Cost_Other />
+		<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</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>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>26048004</File_Size_Bytes>
+			<File_Size_K>25437</File_Size_K>
+			<File_Size_MB>24.84</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
+			<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...).
+
+
+
+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>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
+			<Application_Order_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</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_doliwamp.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<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>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<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_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -1,186 +1,194 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_PML>
-	<AppVerInfo>PADGen 3.1.0.41</AppVerInfo>
-	<CompanyName />
-	<Program_Info>
-		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>2.8.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
-		<Program_Release_Year>2010</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>No Install Support</Program_Install_Support>
-		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Catalan,Dutch,French,German,Italian,Norwegian,Portuguese,Spanish</Program_Language>
-		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>9359175</File_Size_Bytes>
-			<File_Size_K>9139</File_Size_K>
-			<File_Size_MB>8.93</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>dolibarr, erp, crm, invoice, order, management, company, sme, accounting</Keywords>
-			<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 medium company 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 medium companies, 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 use
-    * Simple to develop 
-
-Note that 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. This version is called DoliWamp.</Char_Desc_2000>
-		</English>
-	</Program_Descriptions>
-	<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>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://www.asp-shareware.org/pad/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<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_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
-</PADGEN_PML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_PML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<CompanyName />
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<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 />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,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>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>9359175</File_Size_Bytes>
+			<File_Size_K>9139</File_Size_K>
+			<File_Size_MB>8.93</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<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/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 use
+
+
+
+    * 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>
+	</Program_Descriptions>
+	<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>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
--- a/build/pad/NLTechno.cml
+++ b/build/pad/NLTechno.cml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_CML>
-	<AppVerInfo>PADGen 3.1.0.41</AppVerInfo>
-	<Company_Info>
-		<Company_Name>NLTechno</Company_Name>
-		<Address_1>61 Boulevard Vauban</Address_1>
-		<Address_2 />
-		<City_Town>Montigny-le-Bretonneux</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>78180</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>NLTechno</Author_First_Name>
-			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>dolibarr@nltechno.com</Author_Email>
-			<Contact_First_Name>NLTechno</Contact_First_Name>
-			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
-			<Support_Email>dolibarr@nltechno.com</Support_Email>
-			<General_Email>dolibarr@nltechno.com</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-</PADGEN_CML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_CML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<Company_Info>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>11 Rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+</PADGEN_CML>
--- a/build/pad/pad_dolibarr.htm
+++ b/build/pad/pad_dolibarr.htm
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -1,216 +1,240 @@
-<?xml version="1.0" ?>
-<XML_DIZ_INFO>
-	<MASTER_PAD_VERSION_INFO>
-		<MASTER_PAD_VERSION>3.10</MASTER_PAD_VERSION>
-		<MASTER_PAD_EDITOR>PADGen 3.1.0.41 http://www.padgen.org</MASTER_PAD_EDITOR>
-		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
-	</MASTER_PAD_VERSION_INFO>
-	<Company_Info>
-		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>61 Boulevard Vauban</Address_1>
-		<Address_2 />
-		<City_Town>Montigny-le-Bretonneux</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>78180</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>Dolibarr team</Author_First_Name>
-			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
-			<Contact_First_Name>Dolibarr team</Contact_First_Name>
-			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
-			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
-			<General_Email>dolibarr-dev@nongnu.org</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-	<Program_Info>
-		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>2.8.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
-		<Program_Release_Year>2010</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>No Install Support</Program_Install_Support>
-		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Catalan,Dutch,French,German,Italian,Norwegian,Portuguese,Spanish</Program_Language>
-		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>9359175</File_Size_Bytes>
-			<File_Size_K>9139</File_Size_K>
-			<File_Size_MB>8.93</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>dolibarr, erp, crm, invoice, order, management, company, sme, accounting</Keywords>
-			<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 medium company 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 medium companies, 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 use
-    * Simple to develop 
-
-Note that 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. This version is called DoliWamp.</Char_Desc_2000>
-		</English>
-	</Program_Descriptions>
-	<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>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://www.asp-shareware.org/pad/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<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_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
-</XML_DIZ_INFO>
+<?xml version="1.0" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>Dolibarr team</Company_Name>
+		<Address_1>61 Boulevard Vauban</Address_1>
+		<Address_2 />
+		<City_Town>Montigny-le-Bretonneux</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>78180</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>Dolibarr team</Author_First_Name>
+			<Author_Last_Name>Dolibarr team</Author_Last_Name>
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Contact_First_Name>Dolibarr team</Contact_First_Name>
+			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
+			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
+			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
+			<General_Email>dolibarr-dev@nongnu.org</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<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 />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,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>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>9359175</File_Size_Bytes>
+			<File_Size_K>9139</File_Size_K>
+			<File_Size_MB>8.93</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<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/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 use
+
+
+
+
+
+
+
+    * 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>
+	</Program_Descriptions>
+	<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>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
--- a/build/pad/pad_doliwamp.htm
+++ b/build/pad/pad_doliwamp.htm
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -1,211 +1,216 @@
-<?xml version="1.0" ?>
-<XML_DIZ_INFO>
-	<MASTER_PAD_VERSION_INFO>
-		<MASTER_PAD_VERSION>3.10</MASTER_PAD_VERSION>
-		<MASTER_PAD_EDITOR>PADGen 3.1.0.41 http://www.padgen.org</MASTER_PAD_EDITOR>
-		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
-	</MASTER_PAD_VERSION_INFO>
-	<Company_Info>
-		<Company_Name>NLTechno</Company_Name>
-		<Address_1>61 Boulevard Vauban</Address_1>
-		<Address_2 />
-		<City_Town>Montigny-le-Bretonneux</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>78180</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>NLTechno</Author_First_Name>
-			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>dolibarr@nltechno.com</Author_Email>
-			<Contact_First_Name>NLTechno</Contact_First_Name>
-			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
-			<Support_Email>dolibarr@nltechno.com</Support_Email>
-			<General_Email>dolibarr@nltechno.com</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-	<Program_Info>
-		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>2.8.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>13</Program_Release_Day>
-		<Program_Release_Year>2010</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<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_Language>English,Catalan,Dutch,French,German,Italian,Norwegian,Portuguese,Spanish</Program_Language>
-		<Program_Change_Info>http://www.dolibarr.org</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>26048004</File_Size_Bytes>
-			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>24.84</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>doliwamp, dolibarr, erp, crm, management, company, accounting</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your companyfoundation</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 medium company 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 medium companies, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. It's an 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.
-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.
-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 use, Simple to develop. 
-</Char_Desc_2000>
-		</English>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
-			<Application_Order_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</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_doliwamp.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<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>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://www.asp-shareware.org/pad/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<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_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
-</XML_DIZ_INFO>
+<?xml version="1.0" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>11 Rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>DoliWamp</Program_Name>
+		<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 />
+		<Program_Cost_Other />
+		<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</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>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>26048004</File_Size_Bytes>
+			<File_Size_K>25437</File_Size_K>
+			<File_Size_MB>24.84</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
+			<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...).
+
+
+
+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>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
+			<Application_Order_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</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_doliwamp.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<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>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<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_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
--- a/build/patch/buildpatch.ksh
+++ b/build/patch/buildpatch.ksh
@@ -19,5 +19,5 @@ export newdir=modified_dir

 echo ----- Building patch file mypatch.patch -----
 echo Build patch between \"$olddir\" and \"$newdir\" 
-diff -Naur --exclude=CVS --exclude="*.patch" --exclude=".#*" --exclude="*~" --exclude="*.rej" --exclude="*.orig" --exclude="*.bak" --exclude=conf.php --exclude=documents  $olddir  $newdir  > mypatch.patch
+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
@@ -2,7 +2,7 @@
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
 # \version      $Revision$
-# \author       (c)2009 Regis Houssin  <regis@dolibarr.fr>
+# \author       (c)2009-2010 Regis Houssin  <regis@dolibarr.fr>
 #----------------------------------------------------------------------------


@@ -23,25 +23,30 @@ sub script_dolibarr_longdesc
 return "Dolibarr ERP/CRM is a powerful Open Source software to manage a professional or foundation activity (small and medium enterprises, freelancers).";
 }

+sub script_dolibarr_author
+{
+return "Regis Houssin";
+}
+
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "2.7.0", "2.7.1", "2.8.0" );
+return ( "3.0.0", "2.9.0", "2.8.1" );
 }

 sub script_dolibarr_category
 {
-return "ERP/CRM";
+return "Commerce";
 }

 sub script_dolibarr_php_vers
 {
-return ( 4, 5 );
+return ( 5 );
 }

 sub script_dolibarr_php_vars
 {
-return ( [ 'memory_limit', '32M', '+' ],
+return ( [ 'memory_limit', '64M', '+' ],
 	[ 'upload_max_filesize', '10M', '+' ],
 	[ 'max_execution_time', '60', '+' ] );
 }
@@ -82,8 +87,10 @@ else {
 	$rv .= &ui_table_row("Install sub-directory under <tt>$hdir</tt>",
 			     &ui_opt_textbox("dir", "dolibarr", 30,
 					     "At top level"));
-	#$rv .= &ui_table_row("Install sample content?",
-	#		     &ui_yesno_radio("sample", 0));
+	if ($d->{'ssl'} && $ver >= 2.9) {
+		$rv .= &ui_table_row("Force https connection?",
+				     &ui_yesno_radio("forcehttps", 0));
+		}
 	}
 return $rv;
 }
@@ -107,7 +114,7 @@ else {
 		 'newdb' => $newdb,
 		 'dir' => $dir,
 		 'path' => $in->{'dir_def'} ? "/" : "/$in->{'dir'}",
-		 'sample' => $in->{'sample'}, };
+		 'forcehttps' => $in->{'forcehttps'}, };
 	}
 }

@@ -177,12 +184,20 @@ local $cfile = $cfiledir."conf.php";
 local $oldcfile = &transname();
 local $olddocdir = &transname();
 local $url;
+
+$tmpl = &get_template($d->{'template'});
+$mycharset = $tmpl->{'mysql_charset'};
+$mycollate = $tmpl->{'mysql_collate'};
+$pgcharset = $tmpl->{'postgres_encoding'};
+$charset = $dbtype eq "mysql" ? $mycharset : $pgcharset;
+$collate = $dbtype eq "mysql" ? $mycollate : "C";
+
 $path = &script_path_url($d, $opts);
-if ($path =~ /^https:/) {
-        $url = "https://www.$d->{'dom'}";
+if ($path =~ /^https:/ || $d->{'ssl'}) {
+        $url = "https://$d->{'dom'}";
 }
 else {
-        $url = "http://www.$d->{'dom'}";
+        $url = "http://$d->{'dom'}";
 }
 if ($opts->{'path'} =~ /\w/) {
 	$url .= $opts->{'path'};
@@ -191,13 +206,13 @@ if ($opts->{'path'} =~ /\w/) {
 if (!$upgrade) {
        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);
+	&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);
        }
-# Preserve old config file and documents directory
 else {
+	# Preserve old config file and documents directory
 	&copy_source_dest($cfile, $oldcfile);
 	&copy_source_dest($docdir, $olddocdir);
 	}
@@ -209,22 +224,32 @@ if ($upgrade) {
 	
 	# First page (Update database schema)
 	local @params = ( [ "action", "upgrade" ],
-			  [ "versionfrom", $ver ],
-			  [ "versionto", $upgrade->{'version'} ],
+			  [ "versionfrom", $upgrade->{'version'} ],
+			  [ "versionto", $ver ],
 	 		 );
 	local $err = &call_dolibarr_wizard_page(\@params, "upgrade", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Second page (Migrate some data)
-	local @params = ( [ "action", "upgrade" ] );
+	local @params = ( [ "action", "upgrade" ],
+			  [ "versionfrom", $upgrade->{'version'} ],
+			  [ "versionto", $ver ],
+			 );
 	local $err = &call_dolibarr_wizard_page(\@params, "upgrade2", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
+	# Third page (Update version number)
+	local @params = ( [ "action", "upgrade" ],
+			  [ "versionfrom", $upgrade->{'version'} ],
+			  [ "versionto", $ver ],
+			 );
+	local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+	return (-1, "Dolibarr wizard failed : $err") if ($err);
+	
 	# Remove the installation directory.
 	local $dinstall = "$opts->{'dir'}/install";
 	$dinstall  =~ s/\/$//;
-	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall )."/* ");
-	$out = &run_as_domain_user($d, "rmdir ".quotemeta($dinstall ));
+	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	
 	}
 else {
@@ -238,6 +263,9 @@ else {
 			  [ "db_user", $dbuser ],
 			  [ "db_pass", $dbpass ],
 			  [ "action", "set" ],
+			  [ "main_force_https", $opts->{'forcehttps'} ],
+			  [ "dolibarr_main_db_character_set", $charset ],
+			  [ "dolibarr_main_db_collation", $collate ],
 			 );
 	local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
@@ -259,11 +287,9 @@ else {
 	# Remove the installation directory and protect config file.
 	local $dinstall = "$opts->{'dir'}/install";
 	$dinstall  =~ s/\/$//;
-	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall )."/* ");
-	$out = &run_as_domain_user($d, "rmdir ".quotemeta($dinstall ));
+	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	&set_ownership_permissions(undef, undef, 0644, $cfile);
 	&set_ownership_permissions(undef, undef, 0755, $cfiledir);
-	
 	}
 
 # Return a URL for the user
@@ -320,8 +346,11 @@ return (1, "Dolibarr directory and tables deleted.");
 sub script_dolibarr_latest
 {
 local ($ver) = @_;
-return ( "http://www.dolibarr.fr/files/stable/",
-	 "dolibarr\-(2\.[0-9\.][0-9])" );
+if ($ver >= 2.9) {
+	return ( "http://www.dolibarr.fr/files/stable/",
+		 "dolibarr\\-(2\\.[0-9\\.]+)" );
+	}
+return ( );
 }

 sub script_dolibarr_site
--- a/build/tgz/tar_exclude.txt
+++ b/build/tgz/tar_exclude.txt
@@ -2,10 +2,12 @@ build
 dev/dbmodel
 dev/fpdf
 dev/initdemo
+dev/initdata
 dev/iso-normes
 dev/licence
 dev/load
 dev/skeletons/*socpeople*
+dev/spec
 dev/test
 dev/uml
 dev/xdebug
@@ -19,14 +21,17 @@ doc/dev/iso-normes
 doc/flyer
 doc/font
 doc/rollup
-doc/tshirt
+doc/tshirts
 doc/wiki
 document
 documents
 htdocs/conf/conf.php
 htdocs/conf/conf.php.mysql
+htdocs/conf/conf.php.old
 htdocs/conf/conf.php.postgres
 htdocs/avoir
+htdocs/custom
+htdocs/custom2
 htdocs/document
 htdocs/documents
 htdocs/includes/jpgraph2
@@ -48,12 +53,16 @@ htdocs/includes/modules/modTelephonie.class.php
 htdocs/includes/triggers/interface_user.class.php
 htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN
 htdocs/includes/triggers/interface_modEditeur_Editeur.class.php-NORUN
+htdocs/includes/tcpdf/fonts/utils
+htdocs/includes/tcpdf/fonts/free*.ctg.z
+htdocs/includes/tcpdf/fonts/free*.z
 htdocs/lolix
 htdocs/oscommerce_ws/ws_client_demo
 htdocs/postnuke
 htdocs/public/bplc
 htdocs/rapport
 htdocs/theme/rodolphe
+htdocs/theme/eldy/img/menus/tango*
 htdocs/telephonie
 htdocs/voyage
 mssql
@@ -63,11 +72,13 @@ scripts/courrier
 scripts/lolix
 scripts/product/import-product.php
 scripts/product/materiel.net.php
+test
 CVS
 *~
 .#*
 .cache
 .cvsignore
+.externalToolBuilders
 .htaccess
 .settings
 .project
@@ -94,4 +105,6 @@ bulot
 huitre
 pdf_huitre.modules.php
 doxygen_warnings.log
-dolibarr_install.log
+dolibarr_install.log
+doc_generic_invoice_odt.modules.php
+htdocs/theme/bureau2crea
--- a/build/zip/zip_exclude.txt
+++ b/build/zip/zip_exclude.txt
@@ -1,4 +1,4 @@
-*/build/*
+*/build
 */dev/dbmodel/*
 */dev/fpdf/*
 */dev/initdemo/*
@@ -24,8 +24,11 @@
 */documents/*
 */htdocs/conf/conf.php
 */htdocs/conf/conf.php.mysql
+*/htdocs/conf/conf.php.old
 */htdocs/conf/conf.php.postgres
 */htdocs/avoir/*
+*/htdocs/custom/*
+*/htdocs/custom2/*
 */htdocs/document/*
 */htdocs/documents/*
 */htdocs/lolix/*
@@ -53,11 +56,15 @@
 */htdocs/includes/modules/modPostnuke.class.php
 */htdocs/includes/triggers/interface_user.class.php
 */htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN
+*/htdocs/includes/tcpdf/fonts/utils/*
+*/htdocs/includes/tcpdf/fonts/free*.ctg.z
+*/htdocs/includes/tcpdf/fonts/free*.z
 */htdocs/oscommerce_ws/ws_client_demo/*
 */htdocs/theme/rodolphe/*
 */scripts/addons/*
 */scripts/courrier/*
 */scripts/lolix/*
+*/test
 */CVS/*
 *~
 *.#*
@@ -90,4 +97,6 @@ cvschangelogbuilder_dolibarr*
 */huitre/*
 */pdf_huitre.modules.php
 doxygen_warnings.log
-dolibarr_install.log
+dolibarr_install.log
+*/doc_generic_invoice_odt.modules.php
+*/htdocs/theme/bureau2crea/*
--- a/default.properties
+++ b/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
--- a/dev/dbmodel/dolibarr_schema.mwb
+++ b/dev/dbmodel/dolibarr_schema.mwb
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {

 // Recupere root dolibarr
 $path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../htdocs/master.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact.class.php");
-include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product.class.php");
-include_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
+require ($path."../../htdocs/master.inc.php");
+include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");


 /*
@@ -50,6 +50,15 @@ include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
 define (GEN_NUMBER_COMMANDE, 10);


+$ret=$user->fetch('','admin');
+if ($ret <= 0)
+{
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
+}
+$user->getrights();
+
+
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
@@ -78,16 +87,16 @@ else { print "err"; }


 $prodids = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE envente=1";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
 $resql = $db->query($sql);
-if ($resql) 
+if ($resql)
 {
  $num_prods = $db->num_rows($resql);
  $i = 0;
  while ($i < $num_prods)
    {
      $i++;
-      
+
      $row = $db->fetch_row($resql);
      $prodids[$i] = $row[0];
    }
@@ -146,53 +155,62 @@ $dates = array (mktime(12,0,0,1,3,2003),
 	  mktime(12,0,0,12,13,2003),
 	  );

-require(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
+require(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");


 print "Build ".GEN_NUMBER_COMMANDE." orders\n";
 for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 {
-    print "Order ".$s;
+    print "Process order ".$s."\n";

    $com = new Commande($db);
-    
+
    $com->socid         = 4;
    $com->date_commande  = $dates[rand(1, sizeof($dates)-1)];
-    $com->note           = $_POST["note"];
+    $com->note           = 'A comment';
    $com->source         = 1;
-    $com->projetid       = 0;
+    $com->fk_project     = 0;
    $com->remise_percent = 0;
-    
-	$nbp = rand(2, 5);
-	$xnbp = 0;
-	while ($xnbp < $nbp)
-	{
-	    // \TODO Utiliser addline plutot que add_product
-		$prodid = rand(1, $num_prods);
-	    $result=$com->add_product($prodids[$prodid],rand(1,11),rand(1,6),rand(0,20));
-		if ($result < 0)
-		{
-			dol_print_error($db,$propal->error);
-		}
-		$xnbp++;
-	}
-	
+
+    $db->begin();
+
    $result=$com->create($user);
 	if ($result >= 0)
 	{
 		$result=$com->valid($user);
-		if ($result) print " OK";
+		if ($result > 0)
+		{
+            $nbp = rand(2, 5);
+            $xnbp = 0;
+            while ($xnbp < $nbp)
+            {
+                $prodid = rand(1, $num_prods);
+                $product=new Product($db);
+                $result=$product->fetch($prodids[$prodid]);
+                $result=$com->addline($com->id, $product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+                if ($result < 0)
+                {
+                    dol_print_error($db,$propal->error);
+                }
+                $xnbp++;
+            }
+
+            $db->commit();
+            print " OK with ref ".$com->ref."\n";
+		}
 		else
 		{
-			dol_print_error($db,$com->error);
+            print " KO\n";
+		    $db->rollback();
+		    dol_print_error($db,$com->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$com->error);
+        print " KO\n";
+	    $db->rollback();
+	    dol_print_error($db,$com->error);
 	}
-
-	print "\n";
 }

 ?>
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -27,15 +27,15 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
-    exit;
+	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+	exit;
 }

 // Recupere root dolibarr
 $path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
+require ($path."../../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");


 /*
@@ -45,44 +45,45 @@ require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
 define (GEN_NUMBER_FACTURE, 5);


-$sql = "SELECT min(rowid) FROM ".MAIN_DB_PREFIX."user";
-$resql = $db->query($sql);
-if ($resql)
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
 {
-  $row = $db->fetch_row($resql);
-  $user = new User($db, $row[0]);
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
 }
+$user->getrights();
+

 $socids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client=1";
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_socs = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_socs)
-    {
-      $i++;
+	$num_socs = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num_socs)
+	{
+		$i++;

-      $row = $db->fetch_row($resql);
-      $socids[$i] = $row[0];
-    }
+		$row = $db->fetch_row($resql);
+		$socids[$i] = $row[0];
+	}
 }

 $prodids = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE envente=1";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_prods = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_prods)
-    {
-      $i++;
+	$num_prods = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num_prods)
+	{
+		$i++;

-      $row = $db->fetch_row($resql);
-      $prodids[$i] = $row[0];
-    }
+		$row = $db->fetch_row($resql);
+		$prodids[$i] = $row[0];
+	}
 }

 $i=0;
@@ -102,7 +103,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 	$result=$facture->create($user);
 	if ($result >= 0)
 	{
-		$result=$facture->set_valid($user,$socid);
+		$result=$facture->validate($user);
 		if ($result)
 		{
 			$nbp = rand(2, 5);
@@ -111,12 +112,12 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 			{
 				$prodid = rand(1, $num_prods);
 				$product=new Product($db);
-				$product->fetch($prodids[$prodid]);
-				$result=$facture->addline($facid,$product->description,$product->price, rand(1,5), $product->tva_tx, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+				$result=$product->fetch($prodids[$prodid]);
+				$result=$facture->addline($facture->id,$product->description,$product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
 				$xnbp++;
 			}

-			print " OK";
+			print " OK with ref ".$facture->ref."\n";;
 		}
 		else
 		{
@@ -128,7 +129,6 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		dol_print_error($db,$facture->error);
 	}

-	print "\n";
 }


--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -34,34 +34,51 @@ if (substr($sapi_type, 0, 3) == 'cgi') {

 // Recupere root dolibarr
 $path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../htdocs/master.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact.class.php");
-include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product.class.php");
-include_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
+require ($path."../../htdocs/master.inc.php");
+include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");


 /*
 * Parameters
 */

-define (GEN_NUMBER_PRODUIT, 5);
+define (GEN_NUMBER_PRODUIT, 100000);
+
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();


 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
-if ($db->query($sql)) {
-  $num = $db->num_rows(); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($i);      $productsid[$i] = $row[0];      $i++; } }
+$resql=$db->query($sql);
+if ($resql) {
+  $num = $db->num_rows($resql); $i = 0;
+  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+}

 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
-if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;
-while ($i < $num) { $row = $db->fetch_row($i);      $societesid[$i] = $row[0];      $i++; } } else { print "err"; }
+$resql=$db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
+} else { print "err"; }

 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
-if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;
-while ($i < $num) { $row = $db->fetch_row($i);      $commandesid[$i] = $row[0];      $i++; } } else { print "err"; }
+$resql=$db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
+} else { print "err"; }


 print "Generates ".GEN_NUMBER_PRODUIT." products\n";
@@ -71,15 +88,14 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
    $produit = new Product($db);
    $produit->type = rand(0,1);
    $produit->status = 1;
-    $produit->ref = 'P'.time().$s;
+    $produit->ref = ($produit->type?'S':'P').time().$s;
    $produit->libelle = 'Label '.time().$s;
    $produit->description = 'Description '.time().$s;
    $produit->price = rand(1,1000);
    $produit->tva_tx = "19.6";
    $ret=$produit->create($user);
-    if ($ret < 0) print "Error $ret - ".$produit->error;
-	else print " OK";
-	print "\n";
+    if ($ret < 0) print "Error $ret - ".$produit->error."\n";
+	else print " OK with ref ".$produit->ref."\n";
 }


--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -28,17 +28,17 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
-    exit;
+	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+	exit;
 }

 // Recupere root dolibarr
 $path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
+require ($path."../../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");

 /*
 * Parameters
@@ -47,28 +47,29 @@ require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
 define (GEN_NUMBER_PROPAL, 5);


-$sql = "SELECT min(rowid) FROM ".MAIN_DB_PREFIX."user";
-$resql = $db->query($sql);
-if ($resql)
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
 {
-  $row = $db->fetch_row($resql);
-  $user = new User($db, $row[0]);
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
 }
+$user->getrights();
+

 $socids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client=1";
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_socs = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_socs)
-    {
-      $i++;
+	$num_socs = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num_socs)
+	{
+		$i++;

-      $row = $db->fetch_row($resql);
-      $socids[$i] = $row[0];
-    }
+		$row = $db->fetch_row($resql);
+		$socids[$i] = $row[0];
+	}
 }

 $contids = array();
@@ -76,31 +77,31 @@ $sql = "SELECT rowid, fk_soc FROM ".MAIN_DB_PREFIX."socpeople";
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_conts = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_conts)
-    {
-      $i++;
+	$num_conts = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num_conts)
+	{
+		$i++;

-      $row = $db->fetch_row($resql);
-      $contids[$row[1]][0] = $row[0]; // A ameliorer
-    }
+		$row = $db->fetch_row($resql);
+		$contids[$row[1]][0] = $row[0]; // A ameliorer
+	}
 }

 $prodids = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE envente=1";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_prods = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_prods)
-    {
-      $i++;
+	$num_prods = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num_prods)
+	{
+		$i++;

-      $row = $db->fetch_row($resql);
-      $prodids[$i] = $row[0];
-    }
+		$row = $db->fetch_row($resql);
+		$prodids[$i] = $row[0];
+	}
 }

 $user->rights->propale->valider=1;
@@ -117,16 +118,16 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
 	$i++;
 	$socid = rand(1, $num_socs);
-    print "Proposal ".$i." for socid ".$socid;
+	print "Proposal ".$i." for socid ".$socid;

 	$soc = new Societe($db);


+	$propal = new Propal($db, $socids[$socid]);
+
 	$obj = $conf->global->PROPALE_ADDON;
 	$modPropale = new $obj;
-	$numpr = $modPropale->getNextValue($soc);
-
-	$propal = new Propal($db, $socids[$socid]);
+	$numpr = $modPropale->getNextValue($soc,$propal);

 	$propal->ref = $numpr;
 	$propal->contactid = $contids[$socids[$socid]][0];
@@ -143,22 +144,20 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		while ($xnbp < $nbp)
 		{
 			$prodid = rand(1, $num_prods);
-			$result=$propal->addline($propal->id, 'Description '.$xnbp, '100', rand(1,5), '19.6', $prodids[$prodid], 0);
+			$result=$propal->addline($propal->id, 'Description '.$xnbp, '100', rand(1,5), '19.6', 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
 				dol_print_error($db,$propal->error);
 			}
 			$xnbp++;
 		}
-		print " OK";
+		print " OK with ref ".$propal->ref."\n";
 	}
 	else
 	{
 		dol_print_error($db,$propal->error);
 	}

-	print "\n";
 }

-
 ?>
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {

 // Recupere root dolibarr
 $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
-require ($path."../htdocs/master.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact.class.php");
-include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product.class.php");
-include_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
+require ($path."../../htdocs/master.inc.php");
+include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");

 $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
 $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
@@ -53,18 +53,35 @@ $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Sa
 define (GEN_NUMBER_SOCIETE, 10);


+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
-if ($db->query($sql)) {
-  $num = $db->num_rows(); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($i);      $productsid[$i] = $row[0];      $i++; } }
+$resql=$db->query($sql);
+if ($resql) {
+  $num = $db->num_rows($resql); $i = 0;
+  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+}

 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
-if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;
-while ($i < $num) { $row = $db->fetch_row($i);      $societesid[$i] = $row[0];      $i++; } } else { print "err"; }
+$resql=$db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
+} else { print "err"; }

 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
-if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;
-while ($i < $num) { $row = $db->fetch_row($i);      $commandesid[$i] = $row[0];      $i++; } } else { print "err"; }
+$resql=$db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
+} else { print "err"; }



@@ -77,30 +94,34 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
    $soc->ville = $villes[rand(0,sizeof($villes)-1)];
    $soc->client = rand(1,2);		// Une societe sur 2 est prospect, l'autre client
    $soc->fournisseur = rand(0,1);	// Une societe sur 2 est fournisseur
+    $soc->code_client='CU'.time()."$s";
+    $soc->code_fournisseur='SU'.time()."$s";
    $soc->tva_assuj=1;
    $soc->pays_id=1;
    $soc->pays_code='FR';
-	// Un client sur 10 a une remise de 5%
-    $user_remise=rand(1,10); if ($user_remise==10) $soc->remise_client=5;
+	// Un client sur 3 a une remise de 5%
+    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_client=5;
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_client."\n";
-	$soc->note='Fictional company created by the script generate-societe.php';
+	$soc->note='Company created by the script generate-societe.php';
    $socid = $soc->create();

    if ($socid >= 0)
    {
        $rand = rand(1,4);
-        print "> Generates $rand contact\n";
+        print "> Generates $rand contact(s)\n";
        for ($c = 0 ; $c < $rand ; $c++)
        {
            $contact = new Contact($db);
            $contact->socid = $soc->id;
-            $contact->name = "NomFamille".$c;
+            $contact->name = "Lastname".$c;
            $contact->firstname = $prenoms[rand(0,sizeof($prenoms)-1)];
            if ( $contact->create($user) )
            {

            }
        }
+
+        print "Company ".$s." created nom=".$soc->nom."\n";
    }
    else
    {
--- a/dev/initdata/initdemo.sh
+++ b/dev/initdata/initdemo.sh
@@ -1,18 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 #------------------------------------------------------
 # Script to purge and init a database with demo values.
 # Note: "dialog" tool need to be available.
 #
-# Regis Houssin - regis@dolibarr.fr
+# Regis Houssin       - regis@dolibarr.fr
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
 # WARNING: This script erase all data of database
-# with data into initdemo.sql
+# with data into dump file
 #------------------------------------------------------

-export mydir=`echo "$_" | sed -e 's/initdemo.sh//'`;
+
+export dumpfile="mysqldump_dolibarr_3.0.0.sql"
+export mydir=`echo "$0" | sed -e 's/initdemo.sh//'`;
+if [ "x$mydir" = "x" ]
+then
+    export mydir="."
+fi
 export id=`id -u`;

+
 # ----------------------------- check if root
 if [ "x$id" != "x0" -a "x$id" != "x1001" ]
 then
@@ -20,13 +27,30 @@ then
 	exit
 fi

+# ----------------------------- input file
+DIALOG=${DIALOG=dialog}
+DIALOG="$DIALOG --ascii-lines"
+fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+trap "rm -f $fichtemp" 0 1 2 5 15
+$DIALOG --title "Init Dolibarr with demo values" --clear \
+        --inputbox "Input dump file :" 16 55 $dumpfile 2> $fichtemp
+valret=$?
+case $valret in
+  0)
+dumpfile=`cat $fichtemp`;;
+  1)
+exit;;
+  255)
+exit;;
+esac
+
 # ----------------------------- database name
 DIALOG=${DIALOG=dialog}
 DIALOG="$DIALOG --ascii-lines"
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql database name :" 16 51 dolibarrdemo 2> $fichtemp
+        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
 valret=$?
 case $valret in
  0)
@@ -42,7 +66,7 @@ DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql port (ex: 3306):" 16 51 3306 2> $fichtemp
+        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp

 valret=$?

@@ -60,7 +84,7 @@ DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql root login (ex: root):" 16 51 root 2> $fichtemp
+        --inputbox "Mysql root login (ex: root):" 16 55 root 2> $fichtemp

 valret=$?

@@ -78,7 +102,7 @@ DIALOG=${DIALOG=dialog}
 fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 trap "rm -f $fichtemp" 0 1 2 5 15
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Password for Mysql root login :" 16 51 2> $fichtemp
+        --inputbox "Password for Mysql root login :" 16 55 2> $fichtemp

 valret=$?

@@ -96,7 +120,7 @@ esac
 #fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 #trap "rm -f $fichtemp" 0 1 2 5 15
 #$DIALOG --title "Init Dolibarr with demo values" --clear \
-#        --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 51 2> $fichtemp
+#        --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 55 2> $fichtemp

 #valret=$?

@@ -112,7 +136,7 @@ esac
 # ---------------------------- confirmation
 DIALOG=${DIALOG=dialog}
 $DIALOG --title "Init Dolibarr with demo values" --clear \
-        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 40
+        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55

 case $? in
        0)      echo "Ok, start process...";;
@@ -125,10 +149,10 @@ if [ "x$passwd" != "x" ]
 then
 	export passwd="-p$passwd"
 fi
-#echo "mysql -P$port -u$admin $passwd $base < $mydir/initdemo.sql"
-#mysql -P$port -u$admin $passwd $base < $mydir/initdemo.sql
-echo "mysql -P$port $base < $mydir/initdemo.sql"
-mysql -P$port $base < $mydir/initdemo.sql
+#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
+#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+echo "mysql -P$port $base < $mydir/$dumpfile"
+mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile

 echo "Dolibarr data demo has been loaded."
 echo
--- a/dev/initdata/initdemo.sql
+++ b/dev/initdata/initdemo.sql
--- a/dev/initdata/mysqldump_dolibarr_2.9.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_2.9.0.sql
--- a/dev/initdata/mysqldump_dolibarr_3.0.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.0.0.sql
--- a/dev/iso-normes/xmlexport.txt
+++ b/dev/iso-normes/xmlexport.txt
@@ -0,0 +1 @@
+See specification at http://www.ofx.net
--- a/dev/phpcheckstyle/README
+++ b/dev/phpcheckstyle/README
@@ -0,0 +1,21 @@
+README (English)
+--------------------------------
+
+This directory contains example of PHPCheckStyle configuration
+to use for quality assurance on PHP developpement.
+
+To run PHPCheckstyle in eclipse, you must:
+- install plugin PHP Tools integration http://www.phpsrc.org/eclipse/pti/
+- Unzip PHPCheckStyle archive into a directory.
+- Go in Eclipse - Window - Preferences - Dynamic Languages - Validator
+Choose External PHP Script,
+Set path ro run.php file for localhost
+Choose a PHP version, 
+Set parameter string with 
+  --src %f --config "phpstandard.cfg.xml" --format console
+Choose php as Filename extension
+Check Print PHP output to console
+Then add patern
+    * %f INFO Line:%n - %m     Warning
+    * %f WARNING Line:%n - %m  Warning
+    * %f ERROR Line:%n - %m    Error 
--- a/dev/phpcheckstyle/phpstandard.cfg.xml
+++ b/dev/phpcheckstyle/phpstandard.cfg.xml
@@ -0,0 +1,314 @@
+<!-- somewhat inspired by java checkstyle -->
+<phpcheckstyle-configuration>
+
+    <!--  ****************  -->
+    <!--        Naming      -->
+    <!--  ****************  -->
+    
+    <!-- Check Constant Naming -->
+    <!-- Disabled to avoid warning with $sql="SELECT ..." 
+    <test name="constantNaming" regexp="/^[A-Z_][A-Z_]*[A-Z_]$/" level="ERROR"/>
+    -->
+    
+     <!-- Check Variable Naming -->
+    <test name="variableNaming" regexp="/^[a-zA-Z_][a-zA-Z0-9_]*$/" />
+    
+    <!-- Check Function Naming -->
+    <test name="functionNaming" regexp="/^[a-z_]/" level="WARNING"/>
+    
+    <!-- Check Private Function Naming -->
+    <test name="privateFunctionNaming" regexp="/^[a-z_]/" level="ERROR"/>
+    
+    <!-- Checks the constuctor naming -->
+    <!-- old = old style (constructor = name of the class) -->
+    <!-- new = "__construct()" -->    
+    <test name="constructorNaming">
+        <property name="naming" value="old"/>
+    </test>
+    
+    <!-- Check Class Naming -->
+    <test name="classNaming" regexp="/^[A-Z]/" level="WARNING"/>
+    
+    
+    <!--  ****************  -->
+    <!--      PHP Tags      -->
+    <!--  ****************  -->    
+    
+        
+    <!-- Test if a short php code open tag is used (? instead of ?php ). -->
+    <test name="noShortPhpCodeTag"/>
+    
+    <!-- Test if a PHP closing file is present at the end of a file -->
+    <!-- <test name="noFileCloseTag"/> -->
+    
+    <!-- Test if a file finish with some inner HTML (OK for some view but could provoque "header already sent" error) -->
+    <!-- <test name="noFileFinishHTML" level="ERROR" /> -->
+    
+    
+    <!--  ****************  -->
+    <!--      Comments      -->
+    <!--  ****************  -->    
+    
+    <!-- Check if some C style comments are used (#) -->    
+    <test name="noShellComments"/>
+    
+    <!-- Tests that every function and class is immediately preceded by a docblock. A property "excludePrivateMembers" can be set if you want to disable docblocks for private member functions. -->
+    <test name="docBlocks">
+        <property name="excludePrivateMembers" value="true"/>
+        <property name="testReturn" value="true"/>
+        <property name="testParam" value="true"/>
+        <property name="testThrow" value="true"/>
+    </test>
+
+    
+    <!--  ****************  -->
+    <!--    Indentation     -->
+    <!--  ****************  -->    
+
+    <!-- Tests to make sure that a line does not contain the tab character. -->
+    <!-- <test name="noTabs"/>  -->
+    
+    <!-- Test to make sure that every control structure is included within a {} block, even if it is syntactically optional. -->
+    <!-- <test name="controlStructNeedCurly"/> -->
+    
+    <!-- Check the position of the open curly brace in a control structure (if) -->
+    <!-- sl = same line -->
+    <!-- nl = new line -->
+    <test name="controlStructOpenCurly">
+        <property name="position" value="nl"/>
+    </test>
+
+    <!-- Check the position of the close curly brace  -->
+    <test name="controlCloseCurly" level="INFO">
+    </test>
+        
+    <!-- Check the position of the open curly brace after a function -->
+    <!-- sl = same line -->
+    <!-- nl = new line -->
+    <test name="funcDefinitionOpenCurly">
+        <property name="position" value="nl"/>
+    </test>
+    
+    <!-- Check the position of the else -->
+    <!-- sl = same line -->
+    <!-- nl = new line -->
+    <test name="controlStructElse">
+        <property name="position" value="nl"/>
+    </test>
+    
+    
+    <!--  ****************  -->
+    <!--      Spaces        -->
+    <!--  ****************  --> 
+        
+    <!-- Tests that the control statements ("if", "else", "while", "for", etc.) 
+         are followed by a space before the opening parenthesis. 
+         PEAR standard stipulates this to distinguish it from function calls. 
+    -->
+    <!--
+    <test name="spaceAfterControlStmt"/>
+    -->
+   
+    <!-- Check that there is no space after a function name in a function call -->
+    <!-- <test name="noSpaceAfterFunctionName" level="INFO"></test>  -->  
+     
+    
+    <!-- Check for the (required) presence of a white space after some tokens (like ,) -->
+    <!--
+    <test name="checkWhiteSpaceAfter"> 
+        <exception value="."/>
+    </test>
+    -->
+        
+    <!-- Check for the (required) presence of a white space before some tokens -->
+    <!--
+    <test name="checkWhiteSpaceBefore">
+        <exception value="."/>
+        <exception value=":"/> 
+    </test> 
+    -->
+        
+    <!-- Check that there is no space before before some tokens  -->
+    <!--
+    <test name="noSpaceBeforeToken" level="INFO">
+    </test>
+    -->
+
+    <!-- Check that there is no space after some tokens -->
+    <!--
+    <test name="noSpaceAfterToken"  level="INFO">
+    </test>
+    -->
+    
+    <!--  ****************  -->
+    <!--      Metrics       -->
+    <!--  ****************  --> 
+    
+    <!-- Check that the lenght of the line doesn't pass the max value -->
+    <test name="lineLength" level="INFO">
+        <property name="maxLineLength" value="160"/>
+    </test>
+    
+    <!-- Checks that the lenght (in lines) of a function doesn't pass the max value -->
+    <test name="functionLength" level="INFO">
+        <property name="maxLength" value="500"/>
+    </test>
+    
+    <!--  Checks for excessive parameters in a function declaration -->
+    <!-- <test name="functionMaxParameters">
+        <property name="maxParameters" value="4"/>
+    </test> -->
+    
+    <!-- Check Cyclomatic Complexity -->
+    <!-- see http://www.aivosto.com/project/help/pm-complexity.html -->
+    <test name="cyclomaticComplexity">
+        <!-- Level raising a warning -->
+        <property name="warningLevel" value="10"/>
+        <!-- Level raising an error -->
+        <property name="errorLevel" value="20"/>
+    </test>
+    
+    <!--  ****************  -->
+    <!--      Other         -->
+    <!--  ****************  --> 
+        
+    <!-- All arguments with default values should be at the end -->
+    <test name="defaultValuesOrder"/>
+                    
+    <!-- Check for prohibited functions -->
+    <!-- @see http://www.php.net/manual/en/indexes.php -->
+    <test name="checkProhibitedFunctions">
+        <item value="echo"/>
+        <item value="system"/>
+        <item value="print_r"/>
+        <item value="var_dump"/>
+        <item value="dl"/>
+        <!--<item value="exec"/>-->
+        <item value="passthru"/>
+        <!-- <item value="delete"/> We disable because of false report when using method delete -->
+        <item value="ereg_replace"/>
+        <item value="ereg"/>
+        <item value="eregi"/>
+        <!-- <item value="copy"/>  -->
+        <!-- <item value="fwrite"/>  -->
+    </test>
+    
+    <!-- Check for prohibited tokens -->
+    <!-- @see http://www.php.net/manual/en/tokens.php -->
+    <test name="checkProhibitedTokens">
+        <item value="T_BAD_CHARACTER"/>
+        <item value="T_DECLARE"/>
+        <item value="T_ENDDECLARE"/>
+        <item value="T_ENDFOR"/>
+        <item value="T_ENDFOREACH"/>
+        <item value="T_ENDIF"/>
+        <item value="T_ENDSWITCH"/>
+        <item value="T_ENDWHILE"/>
+        <item value="T_HALT_COMPILER"/>
+        <item value="T_OLD_FUNCTION"/>
+        <!-- <item value="T_PRINT"/> -->
+        
+        <!--  Same thing as the noShortPhpCodeTag rule -->
+        <!-- <item value="T_OPEN_TAG_WITH_ECHO"/> -->
+        
+        <!-- <item value="T_INLINE_HTML"/> -->
+        <!-- <item value="T_ECHO"/>  -->
+        
+        
+    </test>
+    
+     <!-- Check for silenced errors before function calls (@function) -->
+    <test name="checkSilencedError">
+        <exception value="rename"/> <!-- Exceptions to this rule -->
+        <exception value="mkdir"/>
+        <exception value="chmod"/>
+    </test>
+    
+    <!-- Check for encapsed variables inside a String ("$a") -->
+    <test name="encapsedVariablesInsideString">
+    </test>
+    
+     <!-- Avoid passing parameters by reference -->
+    <test name="avoidPassingReferences">
+    </test>
+        
+    <test name="showTODOs">
+    </test>
+    
+    <!-- Use boolean operators (&&) instead of logical operators (AND) -->
+    <test name="useBooleanOperators">
+    </test>
+    
+    <!-- Check empty block like if ($a) {} -->
+    <test name="checkEmptyBlock">
+        <!--  <exception value="catch"/>  -->
+    </test>
+    
+    <!-- Check empty statement ( ;; ) -->
+    <test name="checkEmptyStatement">
+    </test>
+    
+    <!-- Check for the presence of heredoc -->
+    <test name="checkHeredoc">
+    </test>
+    
+    <!-- Check for braces around code blocs (if, else, elseif, do, while, for, foreach) -->
+    <!--
+    <test name="needBraces">
+    </test>
+    -->
+    
+    <!-- Switch need a default value -->
+    <test name="switchNeedDefault">
+    </test>
+    
+     <!-- Switch case should have a break -->
+    <!--  <test name="switchCaseNeedBreak">
+    </test>  -->
+    
+    <!-- Switch default value should be at the end -->
+    <test name="switchDefaultOrder">
+    </test>
+    
+              
+    <!-- 
+    Avoid using unary operators (++) inside a control statement 
+    With the exception of for iterators, all variable incrementation or decrementation should occur in their own toplevel statement to increase readability.  
+    -->
+    <test name="checkUnaryOperator">
+        <exception value="for"/>
+    </test>
+    
+    <!--
+    With inner assignments it is difficult to see all places where a variable is set.
+    With the exception of for iterators, all assignments should occur in their own toplevel statement to increase readability.  
+    -->
+    <test name="checkInnerAssignment">
+        <exception value="for"/>
+    </test>
+    
+    <!-- Detect unused private functions (detecting unused public ones is more difficult) -->
+    <test name="checkUnusedPrivateFunctions">
+    </test>
+    
+    <!-- Detect unused variables -->
+    <test name="checkUnusedVariables">
+    </test>
+    
+    <!-- Detect unused function parameters -->
+    <test name="checkUnusedFunctionParameters">
+    </test>
+    
+    <!-- Only one class declaration per PHP file -->
+    <test name="oneClassPerFile">
+    </test>
+    
+    <!--  *******************  -->
+    <!--      Optimisation     -->
+    <!--  *******************  --> 
+    
+    <!-- Only one class declaration per PHP file -->
+    <test name="functionInsideLoop">
+    </test>
+    
+</phpcheckstyle-configuration>
--- a/dev/phpunit/eclipse_setup_for_pti_phpunit.png
+++ b/dev/phpunit/eclipse_setup_for_pti_phpunit.png
--- a/dev/samples/create_invoice.php
+++ b/dev/samples/create_invoice.php
@@ -0,0 +1,126 @@
+<?PHP
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ *      \file       dev/samples/manage_order.php
+ *      \brief      This file is an example for a command line script
+ *      \version    $Id$
+ *		\author		Put author name here
+ *		\remarks	Put here some comments
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Global variables
+$version='$Revision$';
+$error=0;
+
+
+// -------------------- START OF YOUR CODE HERE --------------------
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
+
+//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
+$langs->load("main");				// To load language file for default language
+@set_time_limit(0);
+
+// Load user and its permissions
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$user->getrights();
+
+
+print "***** ".$script_file." (".$version.") *****\n";
+if (! isset($argv[1])) {	// Check parameters
+    print "Usage: ".$script_file." param1 param2 ...\n";
+    exit;
+}
+print '--- start'."\n";
+print 'Argument 1='.$argv[1]."\n";
+print 'Argument 2='.$argv[2]."\n";
+
+
+// Start of transaction
+$db->begin();
+
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
+
+// Create invoice object
+$obj = new Facture($db);
+
+$obj->ref            = 'ABCDE';
+$obj->socid          = 4;	// Put id of third party (rowid in llx_societe table)
+$obj->date           = mktime();
+$obj->note           = 'A comment';
+$obj->cond_reglement_id = 1;
+
+$line1=new FactureLigne($db);
+$line1->tva_tx=10.0;
+$line1->remise_percent=0;
+$line1->qty=1;
+$line1->total_ht=100;
+$line1->total_tva=10;
+$line1->total_ttc=110;
+$obj->lines[]=$line1;
+
+// Create invoice
+$idobject=$obj->create($user);
+if ($idobject > 0)
+{
+	// Change status to validated
+	$result=$obj->validate($user);
+	if ($result > 0) print "OK Object created with id ".$idobject."\n";
+	else
+	{
+		$error++;
+		dol_print_error($db,$obj->error);
+	}
+}
+else
+{
+	$error++;
+	dol_print_error($db,$obj->error);
+}
+
+
+// -------------------- END OF YOUR CODE --------------------
+
+if (! $error)
+{
+	$db->commit();
+	print '--- end ok'."\n";
+}
+else
+{
+	print '--- end error code='.$error."\n";
+	$db->rollback();
+}
+
+$db->close();
+
+return $error;
+?>
--- a/dev/samples/create_order.php
+++ b/dev/samples/create_order.php
@@ -26,8 +26,7 @@

 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]);
-$path=preg_replace('@[\\\/]+$@','',$path).'/';
+$path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -50,7 +49,7 @@ $langs->load("main");				// To load language file for default language
@set_time_limit(0);

 // Load user and its permissions
-$result=$user->fetch('admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
 if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();

@@ -68,7 +67,7 @@ print 'Argument 2='.$argv[2]."\n";
 // Start of transaction
 $db->begin();

-require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
+require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

 // Create order object
 $com = new Commande($db);
--- a/Show More
+++ b/Show More