Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php

build/debian/README.howto

@@ -13,7 +13,7 @@ with format .DEB (for Debian, Ubuntu, ...).
 
 # This is standard command to work on Debian packaging:
 #
-# gpg --gen-key                          Generate a GPG key
+# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.gpg)
 #
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
@@ -43,10 +43,11 @@ To submit a package to Debian:
 See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
 
 - Wait until you received bug number.
-For first ITP submission of Dolibarr, bug id was 634783.
+  For first ITP submission of Dolibarr, bug id was 634783.
 
-- Check bug is into database by searching with id on http://www.debian.org/Bugs/
+- Check bug is into database by searching with id on 
- 
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
+  
 - Add a line for upstream into file changelog with bug number
 
 - Call for a mentor on ML debian-mentors to upload packages

build/debian/changelog

@@ -4,6 +4,6 @@ dolibarr (3.4.0+nmu1) unstable; urgency=low
   * New upstream release.
     closes: bug#634783
     
- -- Dolibarr team <contact@dolibarr.org>  Sat, 2 Mar 2013 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 22 Apr 2013 12:00:00 +0100     
 
 # For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  

build/debian/po/fr.po

@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
 "Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr "Seveur web à reconfigurer automatiquement:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -44,14 +44,14 @@ msgstr ""
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"
 
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "

build/debian/po/templates.pot

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

build/debian/rules

@@ -111,6 +111,9 @@ clean:
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
 
+	# clean from files to avoid warning of missing dependencies
+	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
+
 	# Licence files are included into copyright file.
 	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
@@ -118,4 +121,4 @@ clean:
 	dh $@
 
 binary-arch:
-	
+	

build/launchpad/README

@@ -28,6 +28,8 @@ a package onto LaunchPad
 - Edit file ~/.bashrc to add
 DEBFULLNAME="<Your name>" 
 DEBEMAIL="<Your email address>" 
+- Create a Bazaar directory
+    mkdir bzr
 
 If you want to build/test package locally:
 - Create a file ~/.pbuilderrc with content
@@ -36,29 +38,42 @@ If you want to build/test package locally:
     sudo pbuilder create [--distribution sid|squeeze]
 
 
-# Push/declare sources to Launchpad
+# Push/declare Dolibarr sources to Launchpad
 #----------------------------------
-
+- From Launchpad project (https://launchpad.net/dolibarr), register a series: 
-- Create a series (https://launchpad.net/dolibarr/)
+    Call it 'trunk' or 'beta' or 'stable'
-    Call it 'dev', 'stable' or 'beta'
+    Use branch (dev):
-    For dev: Configure Series branch - Link to series
+    ~eldy/dolibarr/develop
-    For stable: Add file with *: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
+    ~eldy/dolibarr/beta
-    For beta: Add file with *: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
+    ~eldy/dolibarr/stable
-    mkdir bzr
+    or 
+    Use URL pattern (beta or stable):
+    For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
+    For beta: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
+    
+- For Dev, you can also add link serie to GIT HEAD.
+- For beta and stable, you can init from command line
+	cd bzr/dolibarr-[beta|stable]
     bzr init
     bzr add
     bzr commit -m "Init"
+    bzr push lp:~yourlogin/dolibarr/[beta|stable]
 
-List of series created:
+- List of series are visible here: https://launchpad.net/dolibarr/+series
-https://launchpad.net/dolibarr/trunk
-https://launchpad.net/dolibarr/beta
-https://launchpad.net/dolibarr/stable
 
-# Init repository of sources into launchpad (when repository for sources does not exist)
+# To update Dolibarr into launchpad (when repository for sources already exists)
 #----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+    cd dolibarr-[dev|beta|stable]
+    bzr status
+	-- Update files here --
+    bzr commit -m "Description of change"
+    bzr push
 
-- Create debian directory and upload it onto bzr branch ~yourlogin/+junk/debian-[dev|stable]
+# Init debian dir repository into launchpad (when repository for sources does not exist)
-    mkdir bzr
+#----------------------------------
+-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
     cd bzr
     mkdir debian
     cd debian
@@ -67,27 +82,28 @@ https://launchpad.net/dolibarr/stable
     bzr add
     bzr commit -m "Init control files"
     bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name)
-  or download it from launchpad bazaar:
+- or download it from launchpad bazaar:
     cd bzr
     bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-  
-  For sources, same with
-    bzr push lp:~yourlogin/dolibarr/[dev|beta|stable]
 
-- To update this debian directory, edit files into the bzr dir and run
+# Get debian dir repository from launchpad (when repository for sources already exists)
-    bzr status
-    bzr commit -m "Description of change"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
-
-# Get repository of sources from launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+
+# To update debian dir into launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    cd debian-[dev|beta|stable]
+    bzr status
+	-- Update files here --
+    bzr commit -m "Description of change"
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
 
 
 # Define a recipe into launchpad (a rule to build packages into a PPA)
 #----------------------------------
-
 - Create a file dolibarr.recipe with content
     cd bzr
     vi dolibarr.recipe
@@ -119,11 +135,11 @@ https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
 # To get/download package from PPA:
 #----------------------------------
 
-Add signing key of the Launchpad repository:
+- Add signing key of the Launchpad repository:
 > gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
 > sudo apt-key add ~/.gnupg/pubring.gpg
 
-Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
+- Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
 For the development snapshot version: 
 deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
@@ -134,12 +150,10 @@ For the stable version:
 deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
 
-Update your package cache:
+- Update your package cache:
 > apt-get update
 
-Install Dolibarr: 
+- Install Dolibarr: 
 > apt-get install dolibarr
 
-
+   
-    
-    

build/makepack-dolibarr.pl

@@ -658,6 +658,8 @@ if ($nboftargetok) {
             $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
             $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
             
           
             print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";

build/makepack-howto.txt

@@ -32,7 +32,7 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in /ChangeLog and /filefunc.inc.php
+- Update version/info in ChangeLog
 - Update version number with x.x.x in htdocs/filefunc.inc.php
 - Update version number with x.x.x in build/makepack-dolibarr.pl
 - Update version number with x.x.x in build/debian/changelog

build/perl/virtualmin/dolibarr.pl

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

htdocs/core/modules/modBanque.class.php

@@ -199,4 +199,4 @@ class modBanque extends DolibarrModules
     }
 
 }
-?>
+?>

htdocs/core/modules/syslog/mod_syslog_file.php

@@ -96,8 +96,17 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	/**
 	 * Return the parsed logfile path
 	 *
+<<<<<<< HEAD
 	 * @param	string	$suffixinfilename	When output is a file, append this suffix into default log filename.
 	 * @return	string
+=======
+<<<<<<< OURS
+	 * @return string
+=======
+	 * @param	string	$suffixinfilename	When output is a file, append this suffix into default log filename.
+	 * @return	string
+>>>>>>> THEIRS
+>>>>>>> refs/remotes/origin/3.3
 	 */
 	private function getFilename($suffixinfilename='')
 	{

htdocs/filefunc.inc.php

@@ -253,4 +253,4 @@ if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_d
 	else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 }
 
-?>
+?>

htdocs/langs/fr_FR/admin.lang

@@ -45,8 +45,8 @@ ErrorModuleRequireDolibarrVersion= Erreur, ce module requiert une version %s ou
 ErrorDecimalLargerThanAreForbidden= Erreur, les précisions supérieures à <b>%s</b> ne sont pas supportées.
 DictionnarySetup= Dictionnaires
 Dictionnary= Dictionnaires
-ErrorReservedTypeSystemSystemAuto=
+ErrorReservedTypeSystemSystemAuto=Erreur, La valeur 'system' et 'systemauto' est réservée.
-ErrorCodeCantContainZero=
+ErrorCodeCantContainZero=Erruer, le code ne peut contenir la valeur 0
 DisableJavascript= Désactiver les fonctions Javascript et Ajax
 ConfirmAjax= Utiliser les popups de confirmation Ajax
 UseSearchToSelectCompany= Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.

htdocs/langs/fr_FR/externalsite.lang

@@ -2,4 +2,4 @@
 CHARSET=UTF-8
 ExternalSiteSetup=Configuration du lien vers le site externe
 ExternalSiteURL=URL du site externe
-ExternalSiteModuleNotComplete=
+ExternalSiteModuleNotComplete=La configuration du module "Lien externe" est incomplète.

htdocs/langs/nl_NL/bills.lang

@@ -223,9 +223,9 @@ ExportDataset_invoice_1 = Afnemersfacturen en factuurregels
 ExportDataset_invoice_2 = Afnemersfacturen en -betalingen
 ProformaBill = Proforma factuur:
 Reduction = Vermindering
-ReductionShort = Minder
+ReductionShort = Korting
 Reductions = Verminderingen
-ReductionsShort = Minder
+ReductionsShort = Korting
 Discount = Korting
 Discounts = Kortingen
 ShowDiscount = Toon korting

test/phpunit/DateLibTest.php

@@ -324,19 +324,5 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         return $result;
     }
 
-    /**
-	 *	testDolGetFirstDay
-	 *
-	 *	@return	void
-     */
-    public function testDolGetFirstDay()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-    }
 }
-?>
+?>