Fix: Packaging of doliwamp

Prepare 3.3 release
2026-01-04 16:12:39 +01:00 · 2013-01-09 15:19:00 +01:00 · 2013-01-09 14:55:24 +01:00 · 2013-01-09 14:43:55 +01:00 · 2013-01-09 14:39:50 +01:00 · 2013-01-09 13:29:12 +01:00
939 changed files with 3613 additions and 2877 deletions
--- a/17
+++ b/17
@@ -49,41 +49,42 @@ Copyright

 Copyright (C) 2012
 - 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>
 - Marcos García <marcosgdf@gmail.com>
 - Christophe Battarel <christophe.battarel@altairis.fr>
+- 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>

 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>

@@ -92,7 +93,7 @@ Copyright (C) 2006
 - 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 +105,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/40
+++ b/40
@@ -5,9 +5,12 @@ English Dolibarr ChangeLog

 ***** 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 +38,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.
@@ -61,9 +64,8 @@ For users:
 - 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 +73,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,6 +105,14 @@ 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.
+- 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).
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -8,7 +8,7 @@ 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, Xavier Dutoit               <doli@sydesy.com>
-           2004-2012, Regis Houssin          <regis@dolibarr.fr>
+           2004-2012, 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>
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -22,8 +22,9 @@ AppVerName=DoliWamp-3.3.0-beta
 OutputBaseFilename=DoliWamp-3.3.0-beta
 ; 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
@@ -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,13 +25,15 @@ 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>" 
+
+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
@@ -41,14 +43,14 @@ DEBEMAIL="<Your email address>"
    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 ???
+    For stable: Add file with *: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
+    For dev: Configure Series branch - Link to series
    bzr init
    bzr add
    bzr commit -m "Init"
-    bzr push lp:~eldy/dolibarr/stable
+    bzr push lp:~yourlogin/dolibarr/stable

-# Init package tools for launchpad
+# Init repository of sources into launchpad (when repository for sources does not exist)
 #----------------------------------

 - Create debian directory and upload it onto bzr branch ~yourlogin/+junk/debian-[dev|stable]
@@ -59,14 +61,20 @@ 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)
+    bzr push lp:~yourlogin/+junk/debian-[dev|stable]    (put here any branch name)
  or download it from launchpad bazaar:
    cd bzr
-    bzr branch lp:~eldy/+junk/debian-[dev|stable]
+    bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
 - To update this debian directory, edit files into the bzr dir and run
    bzr status
    bzr commit -m "Description of change"
-    bzr push lp:~eldy/+junk/debian-[dev|stable]
+    bzr push lp:~yourlogin/+junk/debian-[dev|stable]
+
+# Get repository of sources from launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+

 # Define a recipe into launchpad (a rule to build packages into a PPA)
 #----------------------------------
@@ -74,13 +82,18 @@ DEBEMAIL="<Your email address>"
 - 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

@@ -94,11 +107,11 @@ Add signing key of the Launchpad repository:

 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:
 > apt-get update
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -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";



@@ -324,7 +324,6 @@ if ($nboftargetok) {
 	    $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.
--- a/build/obs/README
+++ b/build/obs/README
@@ -17,3 +17,16 @@ 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/lastbuild/package_rpm_generic/dolibarr-3.3.0-0.2.beta1.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/lastbuild/package_rpm_generic/dolibarr-3.3.0-0.2.beta1.src.rpm
+
--- 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>
 #----------------------------------------------------------------------------


--- 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-2.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

--- 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-2.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

--- 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-2.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

--- 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-2.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
--- 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/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -2,3 +2,4 @@
 /custom*
 /bootstrap
 /multicompany
+/skincoloreditor
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -4,7 +4,7 @@
 * 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>
 *
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -2,7 +2,7 @@
 /* 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
--- a/htdocs/adherents/admin/mailman.php
+++ b/htdocs/adherents/admin/mailman.php
@@ -4,7 +4,7 @@
 * 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
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/adherents/admin/spip.php
+++ b/htdocs/adherents/admin/spip.php
@@ -4,7 +4,7 @@
 * 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
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -1,7 +1,7 @@
 <?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>
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -1,5 +1,5 @@
 <?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
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -1,5 +1,5 @@
 <?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>
 *
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -1,5 +1,5 @@
 <?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
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -1,5 +1,5 @@
 <?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
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -1,5 +1,5 @@
 <?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
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -2,7 +2,7 @@
 /* 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
@@ -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/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -4,7 +4,7 @@
 * 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
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -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,7 +1,7 @@
 <?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
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -2,7 +2,7 @@
 /* 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>
 *
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -2,7 +2,7 @@
 /* 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
@@ -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,6 +1,6 @@
 <?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
--- a/htdocs/adherents/info_subscription.php
+++ b/htdocs/adherents/info_subscription.php
@@ -1,6 +1,6 @@
 <?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
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -1,6 +1,6 @@
 <?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
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -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/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -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
@@ -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,7 +1,7 @@
 <?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
@@ -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,7 +2,7 @@
 /* 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
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -1,7 +1,7 @@
 <?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>
 *
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -1,6 +1,6 @@
 <?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
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -2,7 +2,7 @@
 /* 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
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -4,7 +4,7 @@
 * 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>
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -1,7 +1,7 @@
 <?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>
 *
@@ -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,7 +1,7 @@
 <?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
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2010 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) 2006      Andre Cianfarani     <acianfa@free.fr>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 *
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
- * 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
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 * 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) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
 * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
 * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
@@ -371,7 +371,8 @@ if ($id == 11)
 			'propal'            => $langs->trans('Proposal'),
 			'facture'           => $langs->trans('Bill'),
 			'facture_fourn'     => $langs->trans('SupplierBill'),
-			'fichinter'         => $langs->trans('InterventionCard')
+			'fichinter'         => $langs->trans('InterventionCard'),
+			'agenda'			=> $langs->trans('Agenda')
 	);
 	if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
 	$sourceList = array(
@@ -1247,7 +1248,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
 			$align="left";
 			if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="right";	// Fields aligned on right
 			print '<td align="'.$align.'">';
-			print '<input type="text" class="flat" value="'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'libelle_facture') {
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -4,7 +4,7 @@
 * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
 * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
 * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
- * 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) 2011-2012	Philippe Grand			<philippe.grand@atoo-net.com>
 *
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -4,7 +4,7 @@
 * 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
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011	Laurent Destailleur			<eldy@users.sourceforge.net>
 * Copyright (C) 2005		Eric Seigne					<eric.seigne@ryxeo.com>
- * 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) 2012		Juanjo Menent				<jmenent@2byte.es>
 *
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -1,6 +1,6 @@
 <?php
 /* 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) 2012		Juanjo Menent		<jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -3,7 +3,7 @@
 * 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-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-2012 Philippe Grand			    <philippe.grand@atoo-net.com>
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011 Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 Regis Houssin           <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin           <regis.houssin@capnetworks.com>
 * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
 * Copyright (C) 2010-2012 Juanjo Menent           <jmenent@2byte.es>
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-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
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 *
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 *
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 * 
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 * 
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
 *
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2009-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
@@ -168,138 +168,150 @@ else
 }


-// Show examples
-print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n";
-
-// Always show vat rates with vat 0
-$s=2/7;$qty=1;$vat=0;
-$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0,0);
-print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
-print " x ".$langs->trans("Quantity").": ".$qty;
-print " - ".$langs->trans("VAT").": ".$vat.'%';
-print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
-
-$s=10/3;$qty=1;$vat=0;
-$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0,0);
-print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
-print " x ".$langs->trans("Quantity").": ".$qty;
-print " - ".$langs->trans("VAT").": ".$vat.'%';
-print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
-
-$s=10/3;$qty=2;$vat=0;
-$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
-print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
-print " x ".$langs->trans("Quantity").": ".$qty;
-print " - ".$langs->trans("VAT").": ".$vat.'%';
-print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
-
-// Add vat rates examples specific to country
-$vat_rates=array();
-
-$sql.="SELECT taux as vat_rate";
-$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-$sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."' AND taux != 0";
-$sql.=" ORDER BY t.taux ASC";
-$resql=$db->query($sql);
-if ($resql)
+if (empty($mysoc->country_code))
 {
-    $num = $db->num_rows($resql);
-    if ($num)
-    {
-        for ($i = 0; $i < $num; $i++)
-        {
-            $obj = $db->fetch_object($resql);
-            $vat_rates[$i] = $obj->vat_rate;
-        }
-    }
-}
-else dol_print_error($db);
-
-if (count($vat_rates))
-{
-    foreach($vat_rates as $vat)
-    {
-        for ($qty=1; $qty<=2; $qty++)
-        {
-            $s=10/3;
-            $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
-            print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
-            print " x ".$langs->trans("Quantity").": ".$qty;
-            print " - ".$langs->trans("VAT").": ".$vat.'%';
-            print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
-        }
-    }
+	$langs->load("errors");
+	$warnpicto=img_error($langs->trans("WarningMandatorySetupNotComplete"));
+	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
 }
 else
 {
-    // More examples if not specific vat rate found
-    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
-    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.

-    $s=10/3;$qty=1;$vat=10;
-    $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
-    print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
-    print " x ".$langs->trans("Quantity").": ".$qty;
-    print " - ".$langs->trans("VAT").": ".$vat.'%';
-    print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	// Show examples
+	print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n";

-    $s=10/3;$qty=2;$vat=10;
-    $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
-    print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
-    print " x ".$langs->trans("Quantity").": ".$qty;
-    print " - ".$langs->trans("VAT").": ".$vat.'%';
-    print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	// Always show vat rates with vat 0
+	$s=2/7;$qty=1;$vat=0;
+	$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0,0);
+	print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
+	print " x ".$langs->trans("Quantity").": ".$qty;
+	print " - ".$langs->trans("VAT").": ".$vat.'%';
+	print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";

-}
+	$s=10/3;$qty=1;$vat=0;
+	$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0,0);
+	print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
+	print " x ".$langs->trans("Quantity").": ".$qty;
+	print " - ".$langs->trans("VAT").": ".$vat.'%';
+	print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";

-// Important: can debug rounding, to simulate the rounded total
-/*
-print '<br><b>'.$langs->trans("VATRoundedByLine").' ('.$langs->trans("DolibarrDefault").')</b><br>';
+	$s=10/3;$qty=2;$vat=0;
+	$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
+	print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
+	print " x ".$langs->trans("Quantity").": ".$qty;
+	print " - ".$langs->trans("VAT").": ".$vat.'%';
+	print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";

-foreach($vat_rates as $vat)
-{
-	for ($qty=1; $qty<=2; $qty++)
+
+	// Add vat rates examples specific to country
+	$vat_rates=array();
+
+	$sql.="SELECT taux as vat_rate";
+	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+	$sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."' AND taux != 0";
+	$sql.=" ORDER BY t.taux ASC";
+	$resql=$db->query($sql);
+	if ($resql)
 	{
-		$s1=10/3;
-		$s2=2/7;
-
-		// Round by line
-		$tmparray1=calcul_price_total(1,$qty*price2num($s1,'MU'),0,$vat,0,0,0,'HT',0, 0);
-		$tmparray2=calcul_price_total(1,$qty*price2num($s2,'MU'),0,$vat,0,0,0,'HT',0, 0);
-		$total_ht = $tmparray1[0] + $tmparray2[0];
-		$total_tva = $tmparray1[1] + $tmparray2[1];
-		$total_ttc = $tmparray1[2] + $tmparray2[2];
-
-		print $langs->trans("UnitPriceOfProduct").": ".(price2num($s1,'MU') + price2num($s2,'MU'));
-		print " x ".$langs->trans("Quantity").": ".$qty;
-		print " - ".$langs->trans("VAT").": ".$vat.'%';
-		print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
+	    $num = $db->num_rows($resql);
+	    if ($num)
+	    {
+	        for ($i = 0; $i < $num; $i++)
+	        {
+	            $obj = $db->fetch_object($resql);
+	            $vat_rates[$i] = $obj->vat_rate;
+	        }
+	    }
 	}
-}
+	else dol_print_error($db);

-print '<br><b>'.$langs->trans("VATRoundedOnTotal").'</b><br>';
-
-foreach($vat_rates as $vat)
-{
-	for ($qty=1; $qty<=2; $qty++)
+	if (count($vat_rates))
 	{
-		$s1=10/3;
-		$s2=2/7;
-
-		// Global round
-		$subtotal_ht = (($qty*price2num($s1,'MU')) + ($qty*price2num($s2,'MU')));
-		$tmparray3=calcul_price_total(1,$subtotal_ht,0,$vat,0,0,0,'HT',0, 0);
-		$total_ht = $tmparray3[0];
-		$total_tva = $tmparray3[1];
-		$total_ttc = $tmparray3[2];
-
-		print $langs->trans("UnitPriceOfProduct").": ".price2num($s1+$s2,'MU');
-		print " x ".$langs->trans("Quantity").": ".$qty;
-		print " - ".$langs->trans("VAT").": ".$vat.'%';
-		print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
+	    foreach($vat_rates as $vat)
+	    {
+	        for ($qty=1; $qty<=2; $qty++)
+	        {
+	            $s=10/3;
+	            $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
+	            print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
+	            print " x ".$langs->trans("Quantity").": ".$qty;
+	            print " - ".$langs->trans("VAT").": ".$vat.'%';
+	            print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	        }
+	    }
 	}
+	else
+	{
+	    // More examples if not specific vat rate found
+	    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
+	    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
+
+	    $s=10/3;$qty=1;$vat=10;
+	    $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
+	    print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
+	    print " x ".$langs->trans("Quantity").": ".$qty;
+	    print " - ".$langs->trans("VAT").": ".$vat.'%';
+	    print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+
+	    $s=10/3;$qty=2;$vat=10;
+	    $tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0, 0);
+	    print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
+	    print " x ".$langs->trans("Quantity").": ".$qty;
+	    print " - ".$langs->trans("VAT").": ".$vat.'%';
+	    print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+
+	}
+
+	// Important: can debug rounding, to simulate the rounded total
+	/*
+	print '<br><b>'.$langs->trans("VATRoundedByLine").' ('.$langs->trans("DolibarrDefault").')</b><br>';
+
+	foreach($vat_rates as $vat)
+	{
+		for ($qty=1; $qty<=2; $qty++)
+		{
+			$s1=10/3;
+			$s2=2/7;
+
+			// Round by line
+			$tmparray1=calcul_price_total(1,$qty*price2num($s1,'MU'),0,$vat,0,0,0,'HT',0, 0);
+			$tmparray2=calcul_price_total(1,$qty*price2num($s2,'MU'),0,$vat,0,0,0,'HT',0, 0);
+			$total_ht = $tmparray1[0] + $tmparray2[0];
+			$total_tva = $tmparray1[1] + $tmparray2[1];
+			$total_ttc = $tmparray1[2] + $tmparray2[2];
+
+			print $langs->trans("UnitPriceOfProduct").": ".(price2num($s1,'MU') + price2num($s2,'MU'));
+			print " x ".$langs->trans("Quantity").": ".$qty;
+			print " - ".$langs->trans("VAT").": ".$vat.'%';
+			print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
+		}
+	}
+
+	print '<br><b>'.$langs->trans("VATRoundedOnTotal").'</b><br>';
+
+	foreach($vat_rates as $vat)
+	{
+		for ($qty=1; $qty<=2; $qty++)
+		{
+			$s1=10/3;
+			$s2=2/7;
+
+			// Global round
+			$subtotal_ht = (($qty*price2num($s1,'MU')) + ($qty*price2num($s2,'MU')));
+			$tmparray3=calcul_price_total(1,$subtotal_ht,0,$vat,0,0,0,'HT',0, 0);
+			$total_ht = $tmparray3[0];
+			$total_tva = $tmparray3[1];
+			$total_ttc = $tmparray3[2];
+
+			print $langs->trans("UnitPriceOfProduct").": ".price2num($s1+$s2,'MU');
+			print " x ".$langs->trans("Quantity").": ".$qty;
+			print " - ".$langs->trans("VAT").": ".$vat.'%';
+			print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
+		}
+	}
+	*/
 }
-*/
+

 llxFooter();

--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -4,7 +4,7 @@
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * 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) 2011-2012 Philippe Grand		<philippe.grand@atoo-net.com>
 *
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * 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
@@ -40,7 +40,7 @@ $substitutionarrayfortest=array(
 '__EMAIL__' => 'TESTEMail',
 '__LASTNAME__' => 'TESTLastname',
 '__FIRSTNAME__' => 'TESTFirstname',
-'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
+'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
 //'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 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
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
 * Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2011 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2009-2011 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
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
 * Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * 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
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2012 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2010-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
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * 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
@@ -206,9 +206,8 @@ if ($mode==='expdev')      print $langs->trans("ModuleFamilyExperimental")."<br>
 $nbofactivatedmodules=count($conf->modules);
 print $langs->trans("TotalNumberOfActivatedModules",($nbofactivatedmodules-1));
 if ($nbofactivatedmodules <= 1) print ' '.img_warning($langs->trans("YouMustEnableOneModule"));
-print '<br>'."\n";
+print '<br>'."\n";

-print "<br>\n";

 $h = 0;

@@ -266,6 +265,11 @@ $head[$h][2] = 'marketplace';
 $h++;


+// Show warning about external users
+print showModulesExludedForExternal($modules).'<br>'."\n";
+print "<br>\n";
+
+
 dol_fiche_head($head, $mode, $langs->trans("Modules"));

 $var=true;
@@ -495,9 +499,6 @@ else

 dol_fiche_end();

-// Pour eviter bug mise en page IE
-print '<div class="tabsAction">';
-print '</div>';

 llxFooter();

--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -28,6 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Noti

 $langs->load("admin");
 $langs->load("other");
+$langs->load("orders");
+$langs->load("propal");
+$langs->load("bills");

 // Security check
 if (!$user->admin)
@@ -109,8 +112,14 @@ foreach($listofnotifiedevents as $notifiedevent)
 {
    $var=!$var;
    $label=$langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+
+    if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
+    elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
+    elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
+    elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
+
    print '<tr '.$bc[$var].'>';
-    print '<td>'.$notifiedevent['elementtype'].'</td>';
+    print '<td>'.$elementLabel.'</td>';
    print '<td>'.$notifiedevent['code'].'</td>';
    print '<td>'.$label.'</td>';
    print '</tr>';
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2012	   Juanjo Menent		<jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -68,8 +68,12 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup');

 print $langs->trans("DefaultRightsDesc");
 print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+
+// Show warning about external users
+print showModulesExludedForExternal($modules).'<br>'."\n";
 print "<br>\n";

+
 $head=security_prepare_head();

 dol_fiche_head($head, 'default', $langs->trans("Security"));
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010 		Regis Houssin		<regis@dolibarr.fr>
+/* Copyright (C) 2010 		Regis Houssin		<regis.houssin@capnetworks.com>
 * Copyright (C) 2011 		Laurent Destailleur	<eldy@users.sourceforge.net>
 * Copyright (C) 2011-2012 	Juanjo Menent		<jmenent@2byte.es>
 * Copyright (C) 2011-2012  Philippe Grand	    <philippe.grand@atoo-net.com>
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -4,7 +4,7 @@
 * Copyright (C) 2004      Sebastien Di Cintio         <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier              <benoit.mortier@opensides.be>
 * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
- * 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>
 *
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2007 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
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -1,6 +1,6 @@
 <?php
 /* 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
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2011 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
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2008-2010 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) 2012      Juanjo Menent		<jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2012 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) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -198,7 +198,8 @@ foreach ($syslogModules as $moduleName)
 	{
 		foreach ($setuparray as $option)
 		{
-			if (defined($option['constant'])) $value = constant($option['constant']);
+			if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']]; 
+			else if (defined($option['constant'])) $value = constant($option['constant']);
 			else $value = (isset($option['default']) ? $option['default'] : '');

 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2003      Jean-Louis Bergamo    <jlb@j1b.org>
 * Copyright (C) 2004-2012 Laurent Destailleur   <eldy@users.sourceforge.net>
 * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
- * Copyright (C) 2005-2007 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2007 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
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011 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
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2004-2005	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>
 *
 * 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
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2004-2005	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>
 *
 * 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
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2007-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2007-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
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 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
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2010-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2010-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
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 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
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2002	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
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -1,7 +1,7 @@
 <?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
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012	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>
 *
 * 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
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012	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>
 *
 * 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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Destailleur	a415a988a3	Fix: Packaging of doliwamp	2013-01-09 15:19:00 +01:00
Laurent Destailleur	4099b98540	Prepare 3.3 release	2013-01-09 14:55:24 +01:00
Laurent Destailleur	f2af70628d	Prepare 3.3 release	2013-01-09 14:43:55 +01:00
Laurent Destailleur	c282f33d4d	Update changelog	2013-01-09 14:39:50 +01:00
Laurent Destailleur	24b50b8ed3	Fix: Example an label of category import	2013-01-09 13:29:12 +01:00
Laurent Destailleur	4a2a8e438d	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2013-01-09 11:45:04 +01:00
Laurent Destailleur	7114ae33fe	Fix: Doc not uptodate	2013-01-09 11:44:45 +01:00
Laurent Destailleur	e31aedbc50	Merge pull request #584 from jfefe/3.3 Fix bug #666 : error when sending intervention card	2013-01-09 02:23:00 -08:00
Regis Houssin	a7ed40b10d	Fix: empty value if combobox disabled	2013-01-09 10:43:21 +01:00
jfefe	1a3cecfae5	Fix bug #666 : error when sending intervention card	2013-01-09 06:30:27 +01:00
Laurent Destailleur	64d2a662de	Merge pull request #582 from marcosgdf/translations Improvements in translations	2013-01-08 14:03:52 -08:00
Laurent Destailleur	f3df7a2fec	Fix: An easier to understand fix. Remove also not recommanded "continue 2" instructions.	2013-01-08 22:59:36 +01:00
Laurent Destailleur	1555bb681c	Merge pull request #581 from simnandez/3.3 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain	2013-01-08 13:38:38 -08:00
Laurent Destailleur	b7a5e226c9	Fix: Disable menu entry of a not avilable feature	2013-01-08 18:53:45 +01:00
Laurent Destailleur	53df0766cb	Fix: Translation	2013-01-08 18:47:40 +01:00
Laurent Destailleur	334b5b5dac	Fix: Minor fix	2013-01-08 18:31:55 +01:00
Laurent Destailleur	5aeec9eab2	Fix: line into theme	2013-01-08 16:46:06 +01:00
Marcos García	ae98ebc793	There is no need to warn the user as the picto already does	2013-01-08 12:14:11 +01:00
Laurent Destailleur	77f177d846	Fix: Bad selection of option	2013-01-08 11:04:29 +01:00
Laurent Destailleur	a555b47acd	Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3	2013-01-08 10:45:59 +01:00
Laurent Destailleur	47482202ac	Fix: Missing picto	2013-01-08 10:28:22 +01:00
simnandez	596df78d39	Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain	2013-01-08 08:46:48 +01:00
Laurent Destailleur	f96c1d83cb	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2013-01-07 23:22:20 +01:00
Laurent Destailleur	0889bdc3eb	Fix: Error using static method	2013-01-07 23:20:00 +01:00
Laurent Destailleur	eca1e3a7e1	Look: Minor fix in themes	2013-01-07 17:57:39 +01:00
Laurent Destailleur	989e0ba4c3	Merge pull request #580 from marcosgdf/3.3 Updated change log	2013-01-06 16:57:53 -08:00
Marcos García	0e21a61eca	Updated change log	2013-01-07 01:26:33 +01:00
Laurent Destailleur	e5f5e38736	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2013-01-07 00:41:32 +01:00
Laurent Destailleur	091e469050	Fix: [ bug #622 ] attaching wrong file when sending the invoice via e-mail	2013-01-07 00:40:18 +01:00
eldy	24d3fdfe6c	Fix: bad setup entry page	2013-01-06 21:52:59 +01:00
eldy	c0bbd5d730	Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3	2013-01-06 20:46:58 +01:00
eldy	492d00ee86	Fix: Syntax error with pgsql	2013-01-06 20:45:03 +01:00
Laurent Destailleur	567cd00f5c	Fix: Lost button Conflicts: htdocs/compta/facture.php htdocs/fourn/facture/fiche.php	2013-01-06 13:33:09 +01:00
Laurent Destailleur	a40047d464	Merge pull request #578 from marcosgdf/translations Translations!	2013-01-06 04:03:14 -08:00
Laurent Destailleur	d70f671ba0	Merge pull request #576 from simnandez/3.3 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain	2013-01-06 04:02:12 -08:00
Marcos García	ad5d2c3459	Added missing translations, improved es_ES translations and translated untranslated text in modules admin page	2013-01-05 19:23:16 +01:00
Laurent Destailleur	d44b086527	Fix: font size	2013-01-05 16:32:58 +01:00
simnandez	c0246c07b1	Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain	2013-01-05 16:03:00 +01:00
Laurent Destailleur	a9ff3c2be1	Merge pull request #574 from simnandez/3.3 Fix: Modify Spanish localtax2 to new rate	2013-01-05 03:29:54 -08:00
Laurent Destailleur	9ce7a430b8	Merge pull request #573 from marcosgdf/translations Added missing translations	2013-01-05 03:18:33 -08:00
simnandez	c639d80372	Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain	2013-01-05 09:47:54 +01:00
simnandez	32b19802b1	Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain	2013-01-05 09:43:40 +01:00
simnandez	773882c8c0	Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3	2013-01-05 09:42:20 +01:00
simnandez	d0265db3d2	Fix: Modify Spanish localtax2 to new rate	2013-01-05 09:07:01 +01:00
Marcos García	5bf93ca41a	Added missing es_ES translation & fixed typo	2013-01-04 23:56:22 +01:00
Marcos García	d27519338a	Added missing translations Reverted removal of strings in PR #570 Added missing strings to en_US	2013-01-04 22:34:55 +01:00
Cedric GROSS	ff3231045b	Fix: A better fix for escaping data: escape for database must be done during sql request forging. Also renamed tag to tag. Merge: Security fix emailing read and unsubscribe unsubscribe can lead to email disclosure Conflicts: htdocs/public/emailing/mailing-unsubscribe.php	2013-01-04 18:08:34 +01:00
Laurent Destailleur	d86eab713c	Merge pull request #570 from simnandez/3.3 Fix: Withdrawal payment warning	2013-01-04 08:14:16 -08:00
simnandez	9a3681e6b0	Fix: Bug creating invoice from a contract	2013-01-04 16:23:15 +01:00
simnandez	b9ec558501	Trad: Add missing ca_ES and es_ES translations	2013-01-04 16:13:03 +01:00
simnandez	68866eaa5f	Fix: Withdrawal payment warning	2013-01-04 11:07:31 +01:00
Laurent Destailleur	a9ce8083cb	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2013-01-04 00:24:39 +01:00
Laurent Destailleur	86645d8be9	Fix: Field birthday must be hidden for moral members	2013-01-04 00:23:46 +01:00
Laurent Destailleur	932c36e695	Merge pull request #568 from FHenry/3.3 CheckStyle	2013-01-03 11:47:57 -08:00
Regis Houssin	c730aff87b	Fix: possibility to activate jquery plugins with a constant	2013-01-03 19:14:22 +01:00
fhenry	3e05581c70	Same as last commit	2013-01-03 15:13:07 +01:00
fhenry	f2a4e42712	CheckStyle I check everypalce where this function is call in Dolibarr, and to be consistant it's better to use new attribute names	2013-01-03 14:44:04 +01:00
Laurent Destailleur	b667400cc1	Fix: [ bug #618 ] External accounts can access confidential informations (a lot)	2013-01-02 21:35:28 +01:00
Laurent Destailleur	96416735df	Fix: [ bug #618 ] External accounts can access confidential informations (a lot)	2013-01-02 18:43:59 +01:00
Laurent Destailleur	380d036d5c	Fix: Bad test onto project list id	2013-01-02 15:12:46 +01:00
Laurent Destailleur	cd6e3464db	Fix: Several fixes for bad management of external/internal users.	2013-01-02 14:35:16 +01:00
Laurent Destailleur	049a6dc742	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2012-12-31 14:00:38 +01:00
Laurent Destailleur	83a3720f43	Merge pull request #563 from marcosgdf/3.3 Little bug fixes and translations	2012-12-31 04:49:21 -08:00
Laurent Destailleur	53ee487358	Fix: Use standard syntax for version	2012-12-31 13:40:35 +01:00
Laurent Destailleur	dbdc4e6ce8	Fix: Normalize option names	2012-12-31 13:40:13 +01:00
Laurent Destailleur	f7a53eebfb	Fix: Suggested start date of subscription must be validation date.	2012-12-31 13:39:42 +01:00
Marcos García	674034e648	Translated some strings in the code	2012-12-31 05:55:06 +01:00
Marcos García	d7121f6351	Updated demo trigger class with last changes in triggers	2012-12-31 05:30:09 +01:00
Marcos García	93c5acbf39	There's actually no CONTRACT_MODIFY trigger	2012-12-31 05:26:56 +01:00
Marcos García	50975b61b7	Revert "Fixed typo introduced in commit ca2b3f11b166f395e11af74d825989737920e925" This reverts commit `a90db96421`.	2012-12-31 05:22:18 +01:00
Marcos García	adc9897d16	Agenda contacts type wasn't shown in $elementList	2012-12-31 05:10:35 +01:00
Marcos García	3b68faa119	Added missing translations	2012-12-31 05:10:18 +01:00
Marcos García	632b2d7a05	Fixed a bug when modifying a 0% local tax	2012-12-31 04:11:56 +01:00
Marcos García	406ce9e11c	Update changelog + update deprecated triggers in database	2012-12-31 04:11:13 +01:00
Marcos García	a90db96421	Fixed typo introduced in commit `ca2b3f11b1`	2012-12-31 04:10:48 +01:00
Laurent Destailleur	6b6f725f99	Update doc file	2012-12-31 03:13:11 +01:00
Laurent Destailleur	f345e43dad	Fix: date	2012-12-30 22:23:23 +01:00
Laurent Destailleur	815f43904d	Fix: Warning if setup not complete	2012-12-30 21:56:53 +01:00
Laurent Destailleur	df43d477fc	Merge pull request #562 from simnandez/3.3 Fix: Supplier is mandatory into adding invoice suppliers	2012-12-30 08:38:34 -08:00
Laurent Destailleur	86c9011437	Merge pull request #561 from marcosgdf/3.3 Updated changelog + also removed unused triggers when migrating from 3.2.X	2012-12-30 08:36:25 -08:00
Laurent Destailleur	eef861a743	Fix: Update copyright file	2012-12-30 17:26:43 +01:00
Laurent Destailleur	753d79f181	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2012-12-30 17:14:06 +01:00
Laurent Destailleur	0d09de0cf8	Fix: Normalize trigger names for fichinter module.	2012-12-30 17:13:43 +01:00
Regis Houssin	b838895db9	Fix: change for a neutral email	2012-12-30 15:13:49 +01:00
Laurent Destailleur	a1b0fbcc2c	Fix: [ bug #659 ] Comment in recurrent invoices is not stored Fix: Missing payment mode	2012-12-30 14:14:52 +01:00
Laurent Destailleur	201829e60c	Fix:[ bug #653 ] Error while creating additional attributes	2012-12-30 13:49:37 +01:00
Laurent Destailleur	717657dd05	Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO	2012-12-30 12:40:32 +01:00
Marcos García	c3a75307b0	Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into 3.3	2012-12-30 12:37:48 +01:00
Laurent Destailleur	ca2b3f11b1	Fix: Several fix in trigger names	2012-12-30 12:24:53 +01:00
Laurent Destailleur	3fb60304db	Fix: Css for ecm module	2012-12-30 12:02:54 +01:00
simnandez	f05176dc8a	Fix: Date is mandatory into adding customer orders	2012-12-30 10:49:11 +01:00
simnandez	9732a2f336	Fix: Supplier is mandatory into adding invoice suppliers	2012-12-30 10:26:18 +01:00
simnandez	f0f45b70da	Fix: Supplier is mandatory into adding invoice suppliers	2012-12-30 10:24:20 +01:00
Marcos García	10fff57b51	Let's call them just triggers	2012-12-30 02:48:08 +01:00
Laurent Destailleur	b8303bdd5f	Fix: CSS	2012-12-29 23:40:16 +01:00
Marcos García	99bf09dc9e	Updated changelog + also removed unused triggers when migrating from 3.2.x	2012-12-29 18:28:24 +01:00
Laurent Destailleur	703c82f9e2	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2012-12-29 17:35:07 +01:00
Laurent Destailleur	5e05e0aa55	Fix: Trigger names	2012-12-29 17:34:52 +01:00
Laurent Destailleur	bc489773e8	Merge pull request #559 from FHenry/3.3 Fix [ bug #658 ] Seacrh on bank do not work for description	2012-12-29 08:32:47 -08:00
Laurent Destailleur	1667228d74	Fix: Normalize new trigger names.	2012-12-29 16:42:30 +01:00
Laurent Destailleur	caf4130fb7	Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3	2012-12-29 16:41:28 +01:00
Laurent Destailleur	44fe52d5b2	Fix: Missing field	2012-12-29 16:32:47 +01:00
Laurent Destailleur	35a9fbda59	Merge pull request #556 from marcosgdf/3.3 Improved translations	2012-12-29 07:29:29 -08:00
Laurent Destailleur	a84e06cbfc	Merge pull request #555 from simnandez/3.3 Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012	2012-12-29 07:28:55 -08:00
fhenry	32966fe25f	Fix [ bug #658 ] Seacrh on bank do not work for description	2012-12-29 16:02:02 +01:00
Laurent Destailleur	ca6e9643ea	Fix: Pb in json function for objects	2012-12-29 12:21:13 +01:00
Laurent Destailleur	7d60c33c1a	Fix: typo	2012-12-29 12:16:45 +01:00
Laurent Destailleur	17a3204578	Fix: dol_json_encode was wrong with objects	2012-12-29 06:51:12 +01:00
Laurent Destailleur	215139ca72	Fix: Test for css must match test for js	2012-12-29 05:14:07 +01:00
Marcos García	bae8a749b8	Replaced 'Tel' string with 'Phone' to allow translation	2012-12-29 02:51:35 +01:00
Marcos García	4af2a4f875	Improved agenda translations	2012-12-29 02:21:00 +01:00
Laurent Destailleur	6ff9444903	Fix: temporary folder when creating ODT segments on Windows or system…	2012-12-29 01:25:56 +01:00
Marcos García	354c00b9ca	CerfaFR donation template wasn't translating payment mode	2012-12-29 01:13:31 +01:00
Marcos García	316552f4ea	Added missing translation and fixed references to incorrect variable	2012-12-29 00:59:16 +01:00
Marcos García	1b153aef93	Fixed donation payment mode translation and another problem with donation edit form	2012-12-29 00:46:25 +01:00
Marcos García	c8eac78a8d	Translated labels that weren't being translated and improved es_ES translations	2012-12-29 00:24:55 +01:00
Marcos García	7ff5db3385	Improved and added missing es_ES translations	2012-12-29 00:21:50 +01:00
Laurent Destailleur	1722d58196	Fix: Selection of choice in demo page	2012-12-28 22:05:36 +01:00
Laurent Destailleur	2bec26c32a	Fix: Some fix into menu translation	2012-12-28 19:18:04 +01:00
Laurent Destailleur	012ee020a4	Fix: Bad label	2012-12-28 15:48:20 +01:00
simnandez	87434fa9c8	Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012	2012-12-28 11:41:53 +01:00
Laurent Destailleur	8436f0666d	Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG Fix: Margins information must be visible for orders, proposals and invoices only. Fix: Delete button for contracts not visible	2012-12-28 11:36:31 +01:00
Laurent Destailleur	a8012d0f18	Fix: [ bug #617 ] champs non repris lors d'une création de commande à partir d'une propale	2012-12-27 18:02:36 +01:00
Laurent Destailleur	1a530d0ca9	Fix: Broken translation	2012-12-27 17:12:35 +01:00
Laurent Destailleur	ba4be70a5e	Fix: External user was not using correct menu handler.	2012-12-27 17:06:55 +01:00
Laurent Destailleur	f566cd4d99	Fix: Use date of user to define if an action is in past or future.	2012-12-27 15:43:52 +01:00
Laurent Destailleur	251f4f3742	Fix: Avoid duplicate link	2012-12-27 15:33:18 +01:00
Laurent Destailleur	c7b3f2099e	Fix: [ bug #648 ] Warning into instalation Install must use new log modules.	2012-12-27 15:22:40 +01:00
Laurent Destailleur	f9700dc941	Fix: [ bug #651 ] FusionPDF created files cannot be deleted	2012-12-27 14:37:15 +01:00
Laurent Destailleur	fc71073e4e	Fix: Minor fix into user interface	2012-12-27 14:25:52 +01:00
Laurent Destailleur	d4f81a9ee7	Fix: Predefined invoice feature was broken.	2012-12-27 12:51:38 +01:00
Laurent Destailleur	6ba4a22d21	Fix: Migration of payment id not complete	2012-12-27 01:22:00 +01:00
Laurent Destailleur	d607d84da7	Merge pull request #552 from simnandez/3.3 Fix: Box issues	2012-12-26 11:08:24 -08:00
simnandez	a209d5cd55	Fix: Box issues	2012-12-26 12:01:34 +01:00
Laurent Destailleur	3aa9c75b0d	Fix: If thirdparty module not enabled, company and contact fields must not be visibles	2012-12-21 17:56:40 +01:00
Laurent Destailleur	fe469b83ab	Fix: [ bug #641 ] Suppression d'un administrateur	2012-12-21 17:45:13 +01:00
Laurent Destailleur	9b95b3e891	Fix: opensuse package	2012-12-21 17:21:50 +01:00