Removed warning

Fix: regression
Merge pull request #971 from cbattarel/3.3
2025-12-25 02:41:26 +01:00 · 2013-05-22 15:52:26 +02:00 · 2013-05-22 12:02:39 +02:00 · 2013-05-22 02:57:34 -07:00 · 2013-05-22 02:56:06 -07:00 · 2013-05-22 10:29:31 +02:00
1566 changed files with 9321 additions and 7818 deletions
--- a/975
+++ b/975
--- a/61
+++ b/61
@@ -3,25 +3,26 @@ License
 -------

 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
+published by the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version (GPL-3+).
+More information: http://www.gnu.org/licenses/gpl-3.0.txt

-However it uses some external libraries under different licences. This is compatibility summary:
+Dolibarr uses some external libraries released under different licences. This is compatibility summary:

 Composant         Version  License                     Compatible GPL   Usage
 ----------------------------------------------------------------------------
 PHP libraries:
 AdoDb-Date        0.21		Modified BSD License		Yes				Date convertion (not into rpm package)
-CKEditor		  3.6.4		GPL or LGPL 2.1 or MPL 1.1	Yes				Editor WYSIWYG
-FPDI              1.4.2		Apache Software License 2.0	No (GPLv3 only)	PDF templates management (with FPDF_TPL 1.2)
-GeoIP			  2004      LGPL 2.1                    Yes             Sample code to make geoip convert (not into deb package)
-NuSoap            0.9.5		LGPL 2.1					Yes				Library to develop SOAP Web services (not into rpm and deb package)
-OdtPHP            1.0.1		GPL 2.0						Yes				Library to build/edit ODT files
-PHPExcel		  1.7.6		LGPL 2.1					Yes				Read/Write XLS files, read ODS files
-TCPDF             5.9.180	LGPL 3.0					Yes				PDF generation
+CKEditor		  3.6.4		LGPL-2.1+					Yes				Editor WYSIWYG
+FPDI              1.4.2		Apache Software License 2.0	Yes				PDF templates management (with FPDF_TPL 1.2)
+GeoIP			  2004      LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+NuSoap            0.9.5		LGPL 2.1+					Yes				Library to develop SOAP Web services (not into rpm and deb package)
+OdtPHP            1.0.1		GPL-2+						Yes				Library to build/edit ODT files
+PHPExcel		  1.7.6		LGPL-2.1+					Yes				Read/Write XLS files, read ODS files
+TCPDF             5.9.180	LGPL-3+						Yes				PDF generation

 JS libraries:
-jQuery            1.8.2		GPL and MIT Licence			Yes				JS library
+jQuery            1.8.2		MIT Licence					Yes				JS library
 jQuery UI         1.9.1		GPL and MIT Licence			Yes				JS library plugin UI
 jQuery Timepicker 1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
 jQuery Colorpicker 1.1	    MIT Licence					Yes				JS library for color picker for a defined list of colors
@@ -30,7 +31,7 @@ jQuery Flot       0.7		MIT Licence					Yes				JS library to build graph
 jQuery FileUpload 5.0.3		GPL and MIT Licence			Yes				JS library to upload files
 jQuery JCrop      0.9.8		GPL and MIT Licence			Yes				JS library plugin Crop (to crop images)
 jQuery jeditable  1.7.1		GPL and MIT Licence			Yes				JS library plugin jeditable (to edit in place)
-jQuery jNotify	  1.1.00	Apache Software License 2.0	No (GPLv3 only) JS library plugin jNotify (to use ajax popups)
+jQuery jNotify	  1.1.00	Apache Software License 2.0	Yes				JS library plugin jNotify (to use ajax popups)
 jQuery blockUI    2.43      GPL and MIT Licence         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery jPicker	  1.1.00	GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
 jQuery Layout     1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
@@ -39,7 +40,6 @@ jQuery Mobile	  1.0rc2	GPL and MIT Licence			Yes				JS library for smartphone (n
 jQuery Tiptip     1.3		GPL and MIT Licence			Yes				JS library for tooltips
 JSGantt           1.2		BSD Licence					Yes				JS library (to build Gantt reports)

-
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html

@@ -47,52 +47,65 @@ http://www.fsf.org/licensing/licenses/index_html
 Copyright
 ---------

-Copyright (C) 2012
+Copyright (C) 2013
+- Christophe Battarel <christophe.battarel@altairis.fr>
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin	<regis@dolibarr.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
+
+Copyright (C) 2012
+- Christophe Battarel <christophe.battarel@altairis.fr>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Marcos García <marcosgdf@gmail.com>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>
- Marcos García <marcosgdf@gmail.com>
- Christophe Battarel <christophe.battarel@altairis.fr>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin	<regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+- Nicolas Péré <nicolas@amarok2.net>

 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin	<regis@dolibarr.fr>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>

 Copyright (C) 2010
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
 - r2gnl
 - meos

 Copyright (C) 2009
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>

 Copyright (C) 2008
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Jeremie Ollivier <jeremie.o@laposte.net>

 Copyright (C) 2007
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Auguria SARL <info@auguria.org>
 - Jean Heimburger <jean@tiaris.info>
+- Jeremie Ollivier <jeremie.o@laposte.net>

 Copyright (C) 2006
 - Auguria SARL <info@auguria.org>
 - Marc Barilley/Ocebo <marc@ocebo.com>
 - Laurent Destailleur <eldy@users.sourceforge.net>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Andre Cianfarani <acianfa@free.fr>
 - Yannick Warnier <ywarnier@beeznest.org>
 - Jean Heimburger <jean@tiaris.info>
@@ -104,7 +117,7 @@ Copyright (C) 2005
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Eric Seigne <erics@rycks.com>
 - Matthieu Valleton <mv@seeschloss.org>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>

 Copyright (C) 2004
 - Laurent Destailleur  <eldy@users.sourceforge.net>
--- a/88
+++ b/88
@@ -3,11 +3,56 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------


+
+***** ChangeLog for 3.3.2 compared to 3.3.1 *****
+
+- Fix: Dutch (nl_NL) translation
+- Generalize fix: file with a specific mask not found, again
+- Fix: translations and BILL_SUPPLIER_BUILDDOC trigger
+- Fix: Can't reset payment due date
+- Fix: Orderstoinvoice didn't act as expected when no order was checked
+- Fix: Bad link to all proposals into Third party card if customer is prospect
+- Fix: Some bugs on withdrawal rejects
+- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed
+- Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment
+- Fix: [ bug #789 ] VAT not being calculated in POS
+- Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated
+- Fix: [ bug #794 ] Lost filter on zipcode in prospect list 
+- Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price
+- Fix: [ bug #810 ] Cannot update ODT template path
+- Fix: [ bug #816 ] Sales journal does not reflect localtaxes
+- Fix: [ bug #817 ] Purchases journal does not reflect localtaxes
+- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
+- Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres)
+- Fix: [ bug #855 ] Holiday approval email in French
+- Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email
+- Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
+- Fix: [ bug #861 ] Impossible to create a new event in agenda
+- Fix: [ bug #827 ] AJAX search does not respect multiprice level
+- Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work
+- Fix: [ bug #866 ] Standing order from an invoice suggests invoice total amount instead of remaining to pay
+- Fix: [ bug #788 ] Date of linked interventions are not shown
+- Fix: external users should not see costprice and margin infos
+
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- Fix: Localtax2 for Spain must be based into buyer
+- Fix: [ bug #762 ] Bad profit calculation in Reporting
+- Fix: bug dictionnary with wrong prefix table
+
+
+
 ***** ChangeLog for 3.3 compared to 3.2.3 *****
 For users:
+- New: Add holiday module, to declare and follow holidays of your employees.
+- New: Add margin management module.
+- New: Add new theme Amarok.
 - New: [ task #289 ] Can reorder tasks.
- New: Add field "signature" into thirdparty card. If filled, text is added 
-       at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this
+- New: Add field "signature" into user card. If filled, text is added 
+       at end of predefined email texts. If option MAIN_MAIL_DO_NOT_USE_SIGN is on, this
       feature is disabled.
 - New: Can input a payment back onto an credit note.
 - New: Add link "Back to list" on all cards.
@@ -35,13 +80,13 @@ For users:
 - New: Support unique field for extrafields.
 - New: Extra fields supports more types (int, string, double, date, datetime).
 - New: Can correct stock of a warehouse from warehouse card.
- New: [ task #185 ]: Can input amount when correcting stock to recalculate PMP.
- New: [ task #454 ]: Add "No category" into filters on category.
+- New: [ task #185 ] Can input amount when correcting stock to recalculate PMP.
+- New: [ task #454 ] Add "No category" into filters on category.
 - New: Auto check box on page to edit interface options of user.
 - New: More surface control on stock correction page.
 - New: Add great britain provinces.
 - New: [ task #494 ] Send an email to foundation when a new member has auto-subscribed.
- New: [ task #326 ]: Add a numbering module to suggest automatically a product ref.
+- New: [ task #326 ] Add a numbering module to suggest automatically a product ref.
 - New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates.
 - New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
 - New: Can select thirdparties into emailing targets, even if module category is not enabled.
@@ -57,13 +102,12 @@ For users:
 - New: [ task #210 ] Can choose cash account during POS login.
 - New: [ task #104 ] Can create an invoice from several orders.
 - New: Update libs/tools/logo for DoliWamp (now use PHP 5.3).
- New: Added ODT Template tag {object_total_discount}
+- New: Added ODT Template tag {object_total_discount_ht}
 - New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices
 - New: English bank account need a bank code (called sort code) to identify an account. 
 - New: Can choose menu entry to show with external site module.
- New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM
-       to force margins of generated PDF.
- New:  [ task #314 ] Can define if prof id are mandatory or not.
+- New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of generated PDF.
+- New: [ task #314 ] Can define if prof id are mandatory or not.
 - New: Add button on order card to create intervention from services.
 - New: Add search box to find products by supplier reference.
 - New: Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" onto logon page. 
@@ -71,16 +115,18 @@ For users:
 - New: [ task #559 ] Can define a discount % regarding quantity in supplier prices and price by quantity in customer prices
 - New: [ task #527 ] After cloning a suplier invoice, go onto invoice ref into edit mode

-New experimental modules:
- New: Add margin management module.
+New experimental module:
 - New: Add commissions management module.

-
- Fix: [ bug #499 ]: Supplier order input method not translated
- Fix: No images into product description lines as PDF generation does
-  not work with this.
+- Fix: [ bug #499 ] Supplier order input method not translated
+- Fix: No images into product description lines as PDF generation does not work with this.
 - Fix: Errors weren't being shown in customer's & supplier's orders
 - Fix: Lastname wasn't being recorded in xinputuser emailing module.
+- Fix: [ bug #653 ] Error while creating agenda additional attributes
+- Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO
+- Fix: [ bug #658 ] Search on bank do not work for description
+- Fix: [ bug #659 ] Comment in recurrent invoices is not stored
+- Fix: [ bug #622 ] Attaching wrong file when sending the invoice via e-mail

 For developers:
 - New: Add webservice for thirdparty creation and list.
@@ -101,12 +147,24 @@ For developers:
 - New: Add PRODUCT_PRICE_MODIFY trigger.
 - New: Created function to retrieve total amount of discount of an invoice/proposal...
 - New: We can use a dynamic value ($conf->global->XXX for example) into titles of menus.
+- New: Use PHP classes DateTime* for some data functions instead of adodb 
+- Qual: Renamed SUPPLIER_INVOICE_BUILDDOC trigger to BILL_SUPPLIER_BUILDDOC
+- Qual: Renamed INVOICE_SUPPLIER_DELETE trigger to BILL_SUPPLIER_DELETE
+- Qual: Renamed SUPLIER_ORDER_BUILDDOC trigger to ORDER_SUPPLIER_BUILDDOC
+- Qual: Renamed CONTRACTLINE_DELETE trigger to CONTRACT_LINE_DELETE
+- Qual: Renamed all ficheinter.class.php triggers so that they start with 'FICHINTER_'
+- Fix: [ bug #655 ] ORDER_REOPEN trigger incorrectly named
+- Fix: [ bug #656 ] Contracts trigger CONTRACT_MODIFY incorrectly named
+- Fix: [ bug #657 ] Usergroup class' GROUP_DELETE trigger incorrectly named

 For translators:
 - New: Update language files (de, tr, pt, ca, es, en, fr).
 - New: Added bg_BG autotranslated language.
 - New: Translate the donation receipt.

+Dolibarr license has also been updated from GPLv2+ to GPLv3+.
+
+

 ***** ChangeLog for 3.2.3 compared to 3.2.2 *****

--- a/2
+++ b/2
@@ -108,7 +108,7 @@ Other modules:
 - RSS

 Miscellanous:
- Mutli-user, with several permissions levels for each feature.
+- Multi-user, with several permissions levels for each feature.
 - Serveral menu managers (can be used by internal users, as a back-office,
  with a particular menu, or by external users, as a front-office, with
  another menu and permissions).
--- a/2
+++ b/2
@@ -122,7 +122,7 @@ V - CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Pas de compta analytique (uniquement gestion de trésorerie).
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MutliCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
+- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - Ne gère pas la double tva (Fédérale / provinciale) du canada.
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les taches du module de gestion de projets n'ont pas de dépendance entre elle.
--- a/README.md
+++ b/README.md
@@ -3,6 +3,13 @@
 Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.


+
+## LICENSE
+
+Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
+
+
+
 ## INSTALL

 If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensue, Mandriva or Mageia).
@@ -98,7 +105,7 @@ See ChangeLog file found into package.

 ### Miscellanous:

- Mutli-user, with several permissions levels for each feature.
+- Multi-user, with several permissions levels for each feature.
 - Serveral menu managers (can be used by internal users, as a back-office, with a particular menu, or by external users, as a front-office, with another menu and permissions).
 - Very user friendly and easy to use.
 - Optional WYSIWYG forms, optional Ajax forms.
--- a/build/aps/APP-META-1.1.xml
+++ b/build/aps/APP-META-1.1.xml
@@ -56,7 +56,7 @@ standalone software. Dolibarr is designed to provide simplicity to end-user.
 		<!-- Service presentation properties (step 7) -->
 		<license must-accept="false">
 			<text>
-				<name>GPLv2</name>
+				<name>GPL-3.0+</name>
 				<file>COPYING</file>
 			</text>
 		</license>
--- a/build/aps/APP-META-1.2.xml
+++ b/build/aps/APP-META-1.2.xml
@@ -57,7 +57,7 @@ standalone software. Dolibarr is designed to provide simplicity to end-user.
 		<!-- Service presentation properties (step 7) -->
 		<license must-accept="false">
 			<text xml:lang="">
-				<name>GPLv2</name>
+				<name>GPL-3.0+</name>
 				<file>COPYING</file>
 			</text>
 		</license>
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -13,7 +13,7 @@ with format .DEB (for Debian, Ubuntu, ...).

 # This is standard command to work on Debian packaging:
 #
-# gpg --gen-key                          Generate a GPG key
+# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.gpg)
 #
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
@@ -43,10 +43,11 @@ To submit a package to Debian:
 See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.

 - Wait until you received bug number.
-For first ITP submission of Dolibarr, bug id was 634783.
+  For first ITP submission of Dolibarr, bug id was 634783.

- Check bug is into database by searching with id on http://www.debian.org/Bugs/
- 
+- Check bug is into database by searching with id on 
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
+  
 - Add a line for upstream into file changelog with bug number

 - Call for a mentor on ML debian-mentors to upload packages
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,9 +1,9 @@
-dolibarr (3.3.0+nmu1) unstable; urgency=low
+dolibarr (3.3.2+nmu1) unstable; urgency=low

  * Non-maintainer upload.
  * New upstream release.
    closes: bug#634783
    
- -- Dolibarr team <contact@dolibarr.org>  Mon, 10 Aug 2011 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 22 Apr 2013 12:00:00 +0100     

-# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz 
+# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -6,9 +6,9 @@ Source: git@github.com:Dolibarr/dolibarr.git
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
           2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
-           2003-2012, Laurent Destailleur    <eldy@users.sourceforge.net>
+           2003-2013, Laurent Destailleur    <eldy@users.sourceforge.net>
           2003, Xavier Dutoit               <doli@sydesy.com>
-           2004-2012, Regis Houssin          <regis@dolibarr.fr>
+           2004-2013, Regis Houssin          <regis.houssin@capnetworks.com>
           2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
           2004, Benoit Mortier              <benoit.mortier@opensides.be>
           2004, Christophe Combelles        <ccomb@free.fr>
@@ -31,18 +31,18 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
           2008, Matteli                     <unknown@unknown.com>
           2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
           2010, Francois Legastelois        <flegastelois@teclib.com>
-           2010-2012, Juanjo Menent          <jmenent@2byte.es>
-           2010-2012, Philippe Grand         <philippe.grand@atoo-net.com>
+           2010-2013, Juanjo Menent          <jmenent@2byte.es>
+           2010-2013, Philippe Grand         <philippe.grand@atoo-net.com>
           2010, Pierre Morin                <pierre.morin@auguria.net>
           2010, Servitux Servicios Informaticos <info@servitux.es>
           2011, Herve Prot                  <herve.prot@symeos.com>
           2011, Remy Younes                 <ryounes@gmail.com>
-           2012, Christophe Battarel         <christophe.battarel@altairis.fr>
-License: GPL-2+
+           2012-2013, Christophe Battarel         <christophe.battarel@altairis.fr>
+License: GPL-3+
 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 3 of the License, or (at your option) any later
 version.
 .
 This program is distributed in the hope that it will be
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
 "Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -27,13 +27,13 @@ msgstr ""

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr "Seveur web à reconfigurer automatiquement:"

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -44,14 +44,14 @@ msgstr ""
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"

 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/debian/po/templates.pot
+++ b/build/debian/po/templates.pot
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"Project-Id-Version: dolibarr\n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,13 +19,13 @@ msgstr ""

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr ""

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -32,13 +33,13 @@ msgstr ""

 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr ""

 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -112,6 +112,9 @@ clean:
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils

+	# clean from files to avoid warning of missing dependencies
+	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
+
 	# Licence files are included into copyright file.
 	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER = 3.3.0
+PROJECT_NUMBER = 3.3.2

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -17,13 +17,14 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.3.0-beta
+AppVerName=DoliWamp-3.3.2
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.3.0-beta
+OutputBaseFilename=DoliWamp-3.3.2
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-;SourceDir=C:\Documents and Settings\ldestail\git\dolibarr_old
-SourceDir=Z:\home\ldestail\git\dolibarr
+;SourceDir=C:\Documents and Settings\ldestailleur\git\dolibarr_old
+;SourceDir=Z:\home\ldestailleur\git\dolibarr_veryold
+SourceDir=..\..\..
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -32,7 +33,7 @@ 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-2012 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2013 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -102,14 +103,14 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
 ; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
 Source: "C:\Program Files\Wamp\bin\apache\apache2.2.11\*.*"; DestDir: "{app}\bin\apache\apache2.2.11"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\php\php5.3.0\*.*"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\install.forced.php"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -25,33 +25,56 @@ a package onto LaunchPad
    bzr launchpad-login yourlogin
    bzr whoami "Your Name <email@email.com>"
    bzr whoami
+- Edit file ~/.bashrc to add
+DEBFULLNAME="<Your name>" 
+DEBEMAIL="<Your email address>" 
+- Create a Bazaar directory
+    mkdir bzr
+
+If you want to build/test package locally:
 - Create a file ~/.pbuilderrc with content
    COMPONENTS="main universe multiverse restricted"
 - Create chroot ubuntu env
    sudo pbuilder create [--distribution sid|squeeze]
- Edit file ~/.bashrc to add
-DEBFULLNAME="<Your name>" 
-DEBEMAIL="<Your email address>" 


-# Push/declare sources to Launchpad
+# Push/declare Dolibarr sources to Launchpad
 #----------------------------------
-
- Create a Bazaar directory
-    mkdir bzr
- Create a series 
-    Call it 'dev' or 'stable'
-    Add file with *: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
-    ??? Configure Series branch - Link to series ???
+- From Launchpad project (https://launchpad.net/dolibarr), register a series: 
+    Call it 'trunk' or 'beta' or 'stable'
+    Use branch (dev):
+    ~eldy/dolibarr/develop
+    ~eldy/dolibarr/beta
+    ~eldy/dolibarr/stable
+    or 
+    Use URL pattern (beta or stable):
+    http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
+    http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
+    
+- For Dev, you can also add link serie to GIT HEAD.
+- For beta and stable, you can init from command line
+	cd bzr/dolibarr-[beta|stable]
    bzr init
    bzr add
    bzr commit -m "Init"
-    bzr push lp:~eldy/dolibarr/stable
+    bzr push lp:~yourlogin/dolibarr/[beta|stable]

-# Init package tools for launchpad
+- List of series are visible here: https://launchpad.net/dolibarr/+series
+
+# To update Dolibarr into launchpad (when repository for sources already exists)
 #----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+    cd dolibarr-[dev|beta|stable]
+    bzr status
+	-- Update files here --
+    bzr commit -m "Description of change"
+    bzr push

- Create debian directory and upload it onto bzr branch ~yourlogin/+junk/debian-[dev|stable]
+
+# Init debian dir repository into launchpad (when repository for sources does not exist)
+#----------------------------------
+-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
    cd bzr
    mkdir debian
    cd debian
@@ -59,28 +82,44 @@ DEBEMAIL="<Your email address>"
    bzr init
    bzr add
    bzr commit -m "Init control files"
-    bzr push lp:~eldy/+junk/debian-[dev|stable]    (put here any branch name)
-  or download it from launchpad bazaar:
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name)
+- or download it from launchpad bazaar:
    cd bzr
-    bzr branch lp:~eldy/+junk/debian-[dev|stable]
- To update this debian directory, edit files into the bzr dir and run
+    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+
+# Get debian dir repository from launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+
+# To update debian dir into launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    cd debian-[dev|beta|stable]
    bzr status
+	-- Update files here --
    bzr commit -m "Description of change"
-    bzr push lp:~eldy/+junk/debian-[dev|stable]
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
+

 # Define a recipe into launchpad (a rule to build packages into a PPA)
 #----------------------------------
-
 - Create a file dolibarr.recipe with content
    cd bzr
    vi dolibarr.recipe
-        # bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
-        lp:dolibarr
-        merge packaging lp:~eldy/dolibarr/debian
+    	For dev:
+	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
+		lp:dolibarr
+		merge packaging lp:~yourlogin/+junk/debian-dev
+    	For stable:
+	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
+		lp:dolibarr/stable
+		merge packaging lp:~yourlogin/+junk/debian-stable
 - Run command
    cd bzr
    bzr dailydeb dolibarr.recipe working-dir
-  This will create a directory "working-dir" with dolibarr sources and will add sources from ~eldy/dolibarr/debian
+  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|stable]
 - Test package sources
    sudo pbuilder build <working-dir>/<project>_<version>.dsc

@@ -88,24 +127,22 @@ DEBEMAIL="<Your email address>"
 # To get/download package from PPA:
 #----------------------------------

-Add signing key of the Launchpad repository:
+- Add signing key of the Launchpad repository:
 > gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
 > sudo apt-key add ~/.gnupg/pubring.gpg

-Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
+- Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
 For the development snapshot version: 
-deb http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main 
-deb-src http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main 
+deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
+deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
 For the stable version:
-deb http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main 
-deb-src http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main 
+deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
+deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 

-Update your package cache:
+- Update your package cache:
 > apt-get update

-Install Dolibarr: 
+- Install Dolibarr: 
 > apt-get install dolibarr

-
-    
-    
+   
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -10,7 +10,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="3";
-$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="2";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD

@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -45,7 +45,7 @@ if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake


 use vars qw/ $REVISION $VERSION /;
-$VERSION="3.2";
+$VERSION="3.3";



@@ -316,15 +316,16 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;

-	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 	    $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 -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/amarok`;
   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
@@ -655,6 +656,8 @@ if ($nboftargetok) {
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
            
          
            print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -32,12 +32,12 @@ 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 version/info in /ChangeLog and /filefunc.inc.php
- Update version number with x.x.x-y in htdocs/filefunc.inc.php
- Update version number with x.x.x-y in build/makepack-dolibarr.pl
- Update version number with x.x.x-y in build/debian/changelog
- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
- Update version number with x.x.x-y in build/rpm/*.spec
+- Update version/info in ChangeLog
+- Update version number with x.x.x in htdocs/filefunc.inc.php
+- Update version number with x.x.x in build/makepack-dolibarr.pl
+- Update version number with x.x.x in build/debian/changelog
+- Update version number with x.x.x in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.x.x in build/rpm/*.spec
 - Update PAD files.
 - Commit all changes.
 - Add a Tag (DOLIBARR_x_y)
--- a/build/obs/README
+++ b/build/obs/README
@@ -17,3 +17,19 @@ OBS:Screenshots         URL of screenshot
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1

+
+To submit a snapshot for building, we should have a service file with content
+<services>
+  <service name="download_src_package">
+    <param name="host">www.dolibarr.org</param>
+    <param name="protocol">http</param>
+    <param name="path">/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm</param>
+  </service>
+</services>
+
+How to have such a service ?
+Try to make "Add file" and select Remote URL and enter http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm
+
+Then add into advanded - attributes
+OBS:Screenshots http://www.dolibarr.org/images/phocagallery/dolibarr_screenshot1.png
+OBS:QualityCategory Testing
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
 		<Program_Version>3.3.0</Program_Version>
-		<Program_Release_Month>08</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
-		<Program_Release_Year>2012</Program_Release_Year>
+		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Release_Day>17</Program_Release_Day>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
 		<Program_Version>3.3.0</Program_Version>
-		<Program_Release_Month>08</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
-		<Program_Release_Year>2012</Program_Release_Year>
+		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Release_Day>17</Program_Release_Day>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2012 Regis Houssin  <regis@dolibarr.fr>
+# \author       (c)2009-2012 Regis Houssin  <regis.houssin@capnetworks.com>
 #----------------------------------------------------------------------------


@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.3.0", "3.2.1", "3.1.1" );
+return ( "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }

 sub script_dolibarr_category
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPL-2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -165,7 +165,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
 %_datadir/dolibarr/htdocs/compta
 %_datadir/dolibarr/htdocs/conf
 %_datadir/dolibarr/htdocs/contact
@@ -333,5 +332,5 @@ fi


 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3
 - Initial version (#723326)
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -18,7 +18,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPL-2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -241,7 +241,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
 %_datadir/dolibarr/htdocs/compta
 %_datadir/dolibarr/htdocs/conf
 %_datadir/dolibarr/htdocs/contact
@@ -522,5 +521,5 @@ fi


 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3
 - Initial version (#723326)
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPL-2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -162,7 +162,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
 %_datadir/dolibarr/htdocs/compta
 %_datadir/dolibarr/htdocs/conf
 %_datadir/dolibarr/htdocs/contact
@@ -322,5 +321,5 @@ fi


 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3
 - Initial version (#723326)
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPL-2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -27,7 +27,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
 Group: Productivity/Office/Management
 Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
 Requires: mysql-community-server, mysql-community-server-client 
+%if 0%{?suse_version}
 BuildRequires: update-desktop-files fdupes
+%endif

 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -119,6 +121,7 @@ do
  fi
 done >>%{name}.lang

+%if 0%{?suse_version}

 # Enable this command to tag desktop file for suse
 %suse_update_desktop_file dolibarr
@@ -126,6 +129,8 @@ done >>%{name}.lang
 # Enable this command to allow suse detection of duplicate files and create hardlinks instead
 %fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs

+%endif
+

 #---- clean
 %clean
@@ -168,7 +173,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
-%_datadir/dolibarr/htdocs/commissions
 %_datadir/dolibarr/htdocs/compta
 %_datadir/dolibarr/htdocs/conf
 %_datadir/dolibarr/htdocs/contact
@@ -328,5 +332,5 @@ fi


 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.2-0.3
 - Initial version (#723326)
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
@@ -3,7 +3,7 @@
 --
 -- 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
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
@@ -3,7 +3,7 @@
 --
 -- 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
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
@@ -3,7 +3,7 @@
 --
 -- 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
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
@@ -3,7 +3,7 @@
 --
 -- 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
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
@@ -3,7 +3,7 @@
 --
 -- 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
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/examples/create_invoice.php
+++ b/dev/examples/create_invoice.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/examples/create_order.php
+++ b/dev/examples/create_order.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/examples/create_product.php
+++ b/dev/examples/create_product.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/examples/create_user.php
+++ b/dev/examples/create_user.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/examples/get_contracts.php
+++ b/dev/examples/get_contracts.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/initdemo.sh
+++ b/dev/initdata/initdemo.sh
@@ -6,7 +6,7 @@
 # WARNING: This script erase all data of database
 # with data into dump file
 #
-# Regis Houssin       - regis@dolibarr.fr
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
 # Usage: initdemo.sh
--- a/dev/initdata/removedemo.sh
+++ b/dev/initdata/removedemo.sh
@@ -3,7 +3,7 @@
 # Script to remove setup of a Dolibarr installation.
 # Note: "dialog" tool need to be available.
 #
-# Regis Houssin       - regis@dolibarr.fr
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
 # WARNING: This script erase setup of instance, 
--- a/dev/initdata/savedemo.sh
+++ b/dev/initdata/savedemo.sh
@@ -3,7 +3,7 @@
 # Script to extrac a database with demo values.
 # Note: "dialog" tool need to be available if no parameter provided.
 #
-# Regis Houssin       - regis@dolibarr.fr
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
 # Usage: savedemo.sh
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/skeletons/build_webservice_from_class.php
+++ b/dev/skeletons/build_webservice_from_class.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@ $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";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -178,7 +178,7 @@ class modMyModule extends DolibarrModules


 		// Main menu entries
-		$this->menus = array();			// List of menus to add
+		$this->menu = array();			// List of menus to add
 		$r=0;

 		// Add here entries to declare new menus
@@ -228,6 +228,7 @@ class modMyModule extends DolibarrModules
 		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
 		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
 		// $r++;
 	}

--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/skeletons/skeleton_webservice_server.php
+++ b/dev/skeletons/skeleton_webservice_server.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -2,3 +2,4 @@
 /custom*
 /bootstrap
 /multicompany
+/skincoloreditor
--- a/htdocs/accountancy/class/accountancyaccount.class.php
+++ b/htdocs/accountancy/class/accountancyaccount.class.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -4,13 +4,13 @@
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011-2012 Juanjo Menent		<jmenent@2byte.es>
 * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -2,11 +2,11 @@
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
 * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -58,8 +58,6 @@ require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
 * View
 */

-$textobject=$langs->transnoentitiesnoconv("Members");
-
 $help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
 llxHeader('',$langs->trans("MembersSetup"),$help_url);

@@ -73,7 +71,7 @@ $head = member_admin_prepare_head();
 dol_fiche_head($head, 'attributes', $langs->trans("Member"), 0, 'user');


-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Members")).'<br>'."\n";
 print '<br>';

 dol_htmloutput_errors($mesg);
--- a/htdocs/adherents/admin/mailman.php
+++ b/htdocs/adherents/admin/mailman.php
@@ -4,12 +4,12 @@
 * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2006-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2006-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/admin/spip.php
+++ b/htdocs/adherents/admin/spip.php
@@ -4,12 +4,12 @@
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -1,14 +1,14 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2005      Brice Davoleau       <brice.davoleau@gmail.com>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2007      Patrick Raguin  		<patrick.raguin@gmail.com>
 * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2010-2012 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2010-2012 Regis Houssin  <regis.houssin@capnetworks.com>
 * Copyright (C) 2012      Philippe Grand <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2010-2012	Regis Houssin		<regis@dolibarr.fr>
+/* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
 * Copyright (C) 2011		Laurent Destailleur	<eldy@users.sourceforge.net>
 * Copyright (C) 2012       Philippe Grand      <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2010 Regis Houssin  <regis.houssin@capnetworks.com>
 * Copyright (C) 2012 Philippe Grand <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2010 Regis Houssin  <regis.houssin@capnetworks.com>
 * Copyright (C) 2012 Philippe Grand <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2010-2012 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2010-2012 Regis Houssin  <regis.houssin@capnetworks.com>
 * Copyright (C) 2012      Philippe Grand <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -2,11 +2,11 @@
 /* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
 * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -46,7 +46,7 @@ $rowid=GETPOST('rowid','int');
 $typeid=GETPOST('typeid','int');

 // Security check
-$result=restrictedArea($user,'adherent',$rowid);
+$result=restrictedArea($user,'adherent',$rowid,'','cotisation');

 $object = new Adherent($db);
 $extrafields = new ExtraFields($db);
@@ -852,11 +852,12 @@ if ($rowid)
                $datefrom=dol_time_plus_duree($object->datefin,1,'d');
            }
            else
-            {
-                $datefrom=dol_now();
+			{
+                //$datefrom=dol_now();
+				$datefrom=$object->datevalid;
            }
        }
-        $form->select_date($datefrom,'','','','',"cotisation");
+        $form->select_date($datefrom,'','','','',"cotisation",1,1);
        print "</td></tr>";

        // Date end subscription
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -4,11 +4,11 @@
 * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
 * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
- * Copyright (C) 2009-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -423,7 +423,7 @@ class Adherent extends CommonObject
        $this->db->begin();

        $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-        $sql.= " civilite = ".($this->civilite_id?"'".$this->civilite_id."'":"null");
+        $sql.= " civilite = ".(!is_null($this->civilite_id)?"'".$this->civilite_id."'":"null");
        $sql.= ", prenom = ".($this->firstname?"'".$this->db->escape($this->firstname)."'":"null");
        $sql.= ", nom="     .($this->lastname?"'".$this->db->escape($this->lastname)."'":"null");
        $sql.= ", login="   .($this->login?"'".$this->db->escape($this->login)."'":"null");
@@ -538,8 +538,6 @@ class Adherent extends CommonObject
                        $luser->office_phone=$this->phone;
                        $luser->user_mobile=$this->phone_mobile;

-                        $luser->note=$this->note;
-
                        $luser->fk_member=$this->id;

                        $result=$luser->update($user,0,1,1);	// Use nosync to 1 to avoid cyclic updates
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (c) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -46,8 +46,8 @@ if (! $sortfield) {  $sortfield="c.dateadh"; }
 $msg='';
 $date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];

-if (! $user->rights->adherent->cotisation->lire)
-accessforbidden();
+// Security check
+$result=restrictedArea($user,'adherent','','','cotisation');


 /*
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -2,13 +2,13 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2012      Philippe Grand       <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -958,10 +958,11 @@ else
 		$adht = new AdherentType($db);
 		$adht->fetch($object->typeid);

+		$country=GETPOST('pays','int');
 		// We set country_id, and country_code, country of the chosen country
-		if (isset($_POST["pays"]) || $object->country_id)
+		if (!empty($country) || $object->country_id)
 		{
-			$sql = "SELECT rowid, code, libelle as label from ".MAIN_DB_PREFIX."c_pays where rowid = ".(isset($_POST["pays"])?$_POST["pays"]:$object->country_id);
+			$sql = "SELECT rowid, code, libelle as label from ".MAIN_DB_PREFIX."c_pays where rowid = ".(!empty($country)?$country:$object->country_id);
 			$resql=$db->query($sql);
 			if ($resql)
 			{
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -2,11 +2,11 @@
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
 * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -28,10 +28,12 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

-
 $langs->load("companies");
 $langs->load("members");

+// Security check
+$result=restrictedArea($user,'adherent');
+

 /*
 * View
--- a/htdocs/adherents/info.php
+++ b/htdocs/adherents/info.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/info_subscription.php
+++ b/htdocs/adherents/info_subscription.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2006 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2006 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -31,6 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 $langs->load("members");
 $langs->load("companies");

+// Security check
+$result=restrictedArea($user,'adherent');
+
 $action=GETPOST("action");
 $filter=GETPOST("filter");
 $statut=GETPOST("statut");
@@ -70,7 +73,6 @@ if (GETPOST("button_removefilter"))
 }


-
 /*
 * View
 */
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -35,11 +35,10 @@ $mode=GETPOST('mode')?GETPOST('mode'):'';
 // Security check
 if ($user->societe_id > 0)
 {
-	$action = '';
-	$socid = $user->societe_id;
+    $action = '';
+    $socid = $user->societe_id;
 }
-if (! $user->rights->adherent->cotisation->lire)
-	accessforbidden();
+$result=restrictedArea($user,'adherent','','','cotisation');

 $year = strftime("%Y", time());
 $startyear=$year-2;
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -3,7 +3,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -37,8 +37,7 @@ if ($user->societe_id > 0)
    $action = '';
    $socid = $user->societe_id;
 }
-if (! $user->rights->adherent->cotisation->lire)
-accessforbidden();
+$result=restrictedArea($user,'adherent','','','cotisation');

 $year = strftime("%Y", time());
 $startyear=$year-2;
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -33,12 +33,14 @@ $HEIGHT=200;

 $userid=GETPOST('userid','int'); if ($userid < 0) $userid=0;
 $socid=GETPOST('socid','int'); if ($socid < 0) $socid=0;
+
 // Security check
 if ($user->societe_id > 0)
 {
    $action = '';
    $socid = $user->societe_id;
 }
+$result=restrictedArea($user,'adherent','','','cotisation');

 $year = strftime("%Y", time());
 $startyear=$year-2;
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -2,11 +2,11 @@
 /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
 * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011-2012 Juanjo Menent	      <jmenent@2byte.es>
 * Copyright (C) 2011-2012 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2008-2010	Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2011		Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
 * Copyright (C) 2011-2012  Juanjo Menent		<jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -2,12 +2,12 @@
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
 * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -76,8 +76,7 @@ $head=agenda_prepare_head();

 dol_fiche_head($head, 'attributes', $langs->trans("Agenda"));

-
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Agenda")).'<br>'."\n";
 print '<br>';

 dol_htmloutput_errors($mesg);
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -4,7 +4,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2008-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
 * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -211,8 +211,6 @@ if ($action == 'switch')
 */

 $form=new Form($db);
-$emptyuser=new User($db);
-//$infobox=new InfoBox($db);

 llxHeader('',$langs->trans("Boxes"));

@@ -316,7 +314,7 @@ if ($resql)


 // Available boxes
-$boxtoadd=InfoBox::listBoxes($db,'available',-1,$emptyuser,$actives);
+$boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives);

 print "<br>\n";
 print_titre($langs->trans("BoxesAvailable"));
@@ -366,7 +364,7 @@ print '</table>';


 // Activated boxes
-$boxactivated=InfoBox::listBoxes($db,'activated',-1,$emptyuser);
+$boxactivated=InfoBox::listBoxes($db,'activated',-1,null);

 print "<br>\n\n";
 print_titre($langs->trans("BoxesActivated"));
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -5,7 +5,7 @@
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -4,14 +4,14 @@
 * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
 * Copyright (C) 2004      Andre Cianfarani             <acianfa@free.fr>
- * Copyright (C) 2005-2012 Regis Houssin                <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin                <regis.houssin@capnetworks.com>
 * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
 * Copyright (C) 2011-2012 Juanjo Menent			    <jmenent@2byte.es>
 * Copyright (C) 2011 	   Philippe Grand			    <philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -66,7 +66,7 @@ if ($action == 'updateMask')
    }
 }

-if ($action == 'specimen')
+else if ($action == 'specimen')
 {
 	$modele=GETPOST('module','alpha');

@@ -111,7 +111,8 @@ if ($action == 'specimen')
 	}
 }

-if ($action == 'set')
+// Activate a model
+else if ($action == 'set')
 {
 	$label = GETPOST('label','alpha');
 	$scandir = GETPOST('scandir','alpha');
@@ -128,7 +129,7 @@ if ($action == 'set')
 	}
 }

-if ($action == 'del')
+else if ($action == 'del')
 {
 	$type='order';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
@@ -142,7 +143,8 @@ if ($action == 'del')
 	}
 }

-if ($action == 'setdoc')
+// Set default model
+else if ($action == 'setdoc')
 {
 	$label = GETPOST('label','alpha');
 	$scandir = GETPOST('scandir','alpha');
@@ -182,7 +184,7 @@ if ($action == 'setdoc')
 	}
 }

-if ($action == 'setmod')
+else if ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -190,7 +192,7 @@ if ($action == 'setmod')
 	dolibarr_set_const($db, "COMMANDE_ADDON",$value,'chaine',0,'',$conf->entity);
 }

-if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
+else if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("COMMANDE_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
@@ -207,7 +209,7 @@ if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
    }
 }

-if ($action == 'set_COMMANDE_FREE_TEXT')
+else if ($action == 'set_COMMANDE_FREE_TEXT')
 {
 	$freetext = GETPOST("COMMANDE_FREE_TEXT");	// No alpha here, we want exact string

@@ -224,6 +226,14 @@ if ($action == 'set_COMMANDE_FREE_TEXT')
        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
    }
 }
+else if ($action=='setModuleOptions') {
+	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1');
+	}
+}


 /*
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
 * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -678,7 +678,7 @@ else
    print '</td></tr>';

    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Tel").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';

    $var=!$var;
    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . '</td></tr>';
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -1,12 +1,12 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011-2012 Juanjo Menent	      <jmenent@2byte.es>
 *
 * 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
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/Show More
+++ b/Show More