diff --git a/.travis.yml b/.travis.yml
index 5b07b06f696..98ebd9ceea3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ before_script:
  - pyrus install pear/PHP_CodeSniffer
  - phpenv rehash
  - which phpcs
+ - phpcs --version
  - phpcs -i
  - echo Create dir $(pwd)/htdocs/documents
  - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp;
@@ -106,10 +107,10 @@ script:
 # - cat upgrade2.log
  - cd ../..
  - date
- - php -d zend.enable_gc=0 /usr/bin/phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php
+ - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php
  - date
 # - phpcs -p --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php 2>&1
- - php -d zend.enable_gc=0 /usr/bin/phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
+ - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/htdocs/conf/conf.php,/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
  - date
 
 after_script:
diff --git a/ChangeLog b/ChangeLog
index e845af8b952..75c284c0283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,18 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 3.8 compared to 3.7.* *****
+For users:
+- New:
+
+For translators:
+- Update language files.
+- New: When a translation is not available we always jump to en_US and only en_US.
+
+For developers:
+- New: Function yn can show a visual checkbox
+
+
 ***** ChangeLog for 3.7 compared to 3.6.* *****
 For users:
 - New: Match other auth system: Login can be done entering login or user 
@@ -103,6 +115,7 @@ For users:
 - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
+- Fix: datepicker first day of week can be monday by setting into display setup
 
 For users, new experimental module (need to set feature level of instance to experimental to see them):
 - New: Module Accounting Expert to manage accountancy
@@ -322,6 +335,14 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
+Fix: Can't update phone_pro from web service
+Fix: Some security holes.
+Fix: copy extrafields when creating order from proposal.
+Fix: report on action was not filtering by environment.
+Fix: Avoid missing class error.
+Fix: Add function dolEscapeXML.
+Fix: Bad days and month reported by function.
+Fix: Bad margin calculation.
 
 ***** ChangeLog for 3.5.5 compared to 3.5.4 *****
 Fix: Holiday module was broken. Initializaion of amount of holidays failed.
diff --git a/build/debian/README.howto b/build/debian/README.howto
index d44e2b692a6..6d5280e56c1 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -108,13 +108,31 @@ http://bugs.debian.org/package
 severity 123 xxx
 
 
+##### Update but tracker system
+
+To set status of a bug to "pending"
+> bts tag 999999 +pending
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+
+Control: tag -1 +pending
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 +pending
+
+
+
 ##### Testing a package into unstable env
 
-Check you have a mysql server available from another interface than localhost
+Check you have a mysql server available from another interface than "localhost".
 Comment line in /etc/mysql/my.cnf if required and restart mysql
 #bind-address = 127.0.0.1
 
-Create a chroot called "unstable-amd64-sbuild"
+Create a chroot called "unstable-amd64-sbuild".
+Chroot env is stored into /srv/chroot directory.
 > sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
 
 Pour lister les env chroot
@@ -122,6 +140,7 @@ Pour lister les env chroot
 
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot
+> cat /etc/debian_chroot       to check which debian branch we are into
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get install links mysql-client
 
@@ -135,7 +154,10 @@ Pour tester un package
 > dpkg -i dolibarr*.deb  ou   pour avoir des traces: dpkg -D77777 -i dolibarr*.deb
 > apt-get install -f
 
-Puis http://localhost/dolibarr/ (cela peut etre appeler depuis le hote).
+If there is a problem launching apache, because port is already used, change it into your chroot install with
+> vi /etc/apache2/ports.conf
+Then restart.
+Then you can call/test dolibarr with http://localhost:port/dolibarr/ (It can be also called from host).
 
 
 
@@ -202,23 +224,6 @@ http://packages.qa.debian.org/t/tcpdf.html
 * Package will be into release when test will be moved as stable.
 
 
-
-##### Update but tracker system
-To set status of a bug to pending
-> bts tag 999999 +pending
-
-or replay to email 999999@bugs.debian.org + submitter of bug
-With a message starting with: 
-Control: tag -1 +pending
-and then a text like:
-Thanks. Fixed into git.
-
-or replay to email control@bugs.debian.org
-With only message 
-tag 729538 +pending
-
-
-
 ##### Create/Maintain dolibarr package
 
 To update dolibarr debian package
@@ -257,7 +262,7 @@ x.y.z+dfsgw
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z+dfsg-w "My comment" will add entry.
+> dch -v x.y.z+dfsgw-v "My comment" will add entry.
 For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import)
 Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 Then check/modify also the user/date signature:
diff --git a/build/debian/changelog b/build/debian/changelog
index d3772a76785..e8ea7be4823 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -3,81 +3,4 @@ dolibarr (3.7.0-3) UNRELEASED; urgency=low
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 21 Oct 2014 12:00:00 +0100      
-
-dolibarr (3.6.1-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 23 Sep 2014 12:00:00 +0100      
-
-dolibarr (3.6.0-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 15 July 2014 12:00:00 +0100      
-
-dolibarr (3.5.5-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
-
-dolibarr (3.5.4-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 1 July 2014 12:00:00 +0100     
-
-dolibarr (3.5.3-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 2 May 2014 12:00:00 +0100     
-
-dolibarr (3.5.2-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 14 March 2014 12:00:00 +0100     
-
-dolibarr (3.5.1-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 7 Feb 2014 12:00:00 +0100     
-
-dolibarr (3.5.0-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 31 Jan 2014 12:00:00 +0100     
-
-dolibarr (3.4.2-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
-
-dolibarr (3.4.1-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 27 Apr 2013 12:00:00 +0100     
-
-dolibarr (3.4.0-3) UNRELEASED; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 21 Oct 2014 12:00:00 +0100
\ No newline at end of file
diff --git a/build/obs/README b/build/obs/README
index 8fc4c27d9b2..cf312fc0e68 100644
--- a/build/obs/README
+++ b/build/obs/README
@@ -14,7 +14,7 @@ https://build.opensuse.org
 Packaging rules: http://en.opensuse.org/Portal:Packaging
 
 Add attributes:
-OBS:Screenshots         URL of screenshot
+OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1
 
@@ -29,12 +29,18 @@ To submit a snapshot for building, we should have a service file with content
 </services>
 
 How to have such a service file created automatically ?
-Click on "Add file", then select mode "Upload From: Remote URL"
-Enter the Remote URL that should looks like this: http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-3.src.rpm
 
-Then add into advanded - attributes
+Go into project you want to update. It mught be:
+- openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
+- or your private project
+
+Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
+Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
+http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.3.src.rpm
+
+Then add into Advanded - Attributes
 OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Testing
+OBS:QualityCategory Stable|Testing|Development|Private
 
 
 # Move project into official directory
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 1007c84eb96..37bcdf8e96b 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -340,21 +340,3 @@ fi
 
 * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
 - Upstream release
-
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 5fd9a74f1a6..812e0d3a1c0 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -577,20 +577,3 @@ fi
 * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
 - Upstream release
 
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index c6fda416db0..5a81827f5fa 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -346,20 +346,3 @@ fi
 * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
 - Upstream release
 
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 935ebf2e6df..5d1e1e19765 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -357,20 +357,3 @@ fi
 * Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
 - Upstream release
 
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
-- Initial version (#723326)
diff --git a/dev/codesniffer/README b/dev/codesniffer/README
index b06a2b1e5f6..8a68d8a1140 100755
--- a/dev/codesniffer/README
+++ b/dev/codesniffer/README
@@ -1,9 +1,12 @@
 README (English)
 --------------------------------
 
-This directory contains ruleset files to use to
-develop Dolibarr EPR & CRM with Eclipse.
+This directory contains ruleset files to use to develop Dolibarr EPR & CRM.
 
-Note: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with:
+To install/upgrade phpcs:
+> sudo pear upgrade PHP_CodeSniffer
+
+Note with Eclipse: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with:
 * tab value to 4
-* path of code sniffer standard to dev/codesniffer 
\ No newline at end of file
+* path of code sniffer standard to dev/codesniffer 
+
diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 7e3057a6675..ffbc1bace39 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -6,6 +6,7 @@
 	<exclude-pattern>*/conf.php</exclude-pattern>
 	<exclude-pattern>*/includes/*</exclude-pattern>
 	<exclude-pattern>*/documents/*</exclude-pattern>
+	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
 	<exclude-pattern>*/custom/*</exclude-pattern>
 	<exclude-pattern>*/nltechno*</exclude-pattern>
 		
@@ -169,6 +170,40 @@
     <rule ref="PEAR.Commenting.ClassComment.MissingTag">
         <severity>0</severity>
     </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+    <!-- TODO Remove this and fix reported errors -->
+    <rule ref="PEAR.Commenting.ClassComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
     
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
@@ -226,6 +261,24 @@
 	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
 	    <severity>0</severity>
 	</rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
+        <severity>0</severity>
+    </rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
 	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 24a56d5e7c7..e64a67d445d 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -48,7 +48,6 @@ class AdherentStats extends Stats
 	 *	@param 		DoliDB		$db			Database handler
 	 * 	@param 		int			$socid	   	Id third party
      * 	@param   	int			$userid    	Id user for filter
-	 * 	@return 	AdherentStats
 	 */
 	function __construct($db, $socid=0, $userid=0)
 	{
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 23e7cc96363..5c8009d2b13 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -119,7 +119,7 @@ if ($action == 'edit')	// Edit
 
     print_fiche_titre($langs->trans("Language"),'','').'<br>';
     print '<table summary="edit" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
@@ -161,7 +161,7 @@ if ($action == 'edit')	// Edit
 
     // Other
     print '<table summary="edit" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
@@ -301,7 +301,7 @@ else	// Show
     // Language
     print_fiche_titre($langs->trans("Language"),'','').'<br>';
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
@@ -345,7 +345,7 @@ else	// Show
     // Other
     $var=true;
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index a3109647939..6b2c626da39 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -113,35 +113,20 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
 
 $form=new Form($db);
-$var=true;
-print '<table class="noborder" width="100%">';
 
-print '<tr class="liste_titre">';
-print "  <td>".$langs->trans("Parameters")."</td>\n";
-print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
-print '</tr>'."\n";
 
-/*
- * Formulaire parametres divers
- */
+$disabled='';
+if (! empty($conf->productbatch->enabled))
+{
+	$langs->load("productbatch");
+	$disabled=' disabled="disabled"';
+	print info_admin($langs->trans("WhenProductBatchModuleOnOptionAreForced"));
+}
 
-$var=!$var;
-
-print "<tr ".$bc[$var].">";
-print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
-
-print '<td width="160" align="right">';
-print "<form method=\"post\" action=\"stock.php\">";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
-print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print "</td>\n";
-print "</tr>\n";
-print '<br>';
-print '</table>';
-print '<br>';
+//if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
+//{
+print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
+//}
 
 // Title rule for stock decrease
 print '<table class="noborder" width="100%">';
@@ -160,8 +145,8 @@ if (! empty($conf->facture->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_BILL\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -174,8 +159,8 @@ if (! empty($conf->commande->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_VALIDATE_ORDER\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -188,16 +173,12 @@ if (! empty($conf->expedition->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SHIPMENT\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 print '</table>';
 
-//if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-//{
-print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
-//}
 print '<br>';
 
 // Title rule for stock increase
@@ -217,8 +198,8 @@ if (! empty($conf->fournisseur->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_BILL\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -231,8 +212,8 @@ if (! empty($conf->fournisseur->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 if (! empty($conf->fournisseur->enabled))
@@ -244,8 +225,8 @@ if (! empty($conf->fournisseur->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -334,6 +315,34 @@ if ($virtualdiffersfromphysical)
 	print '</table>';
 }
 
+
+$var=true;
+print '<table class="noborder" width="100%">';
+
+print '<tr class="liste_titre">';
+print "  <td>".$langs->trans("Other")."</td>\n";
+print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
+print '</tr>'."\n";
+
+$var=!$var;
+
+print "<tr ".$bc[$var].">";
+print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
+
+print '<td width="160" align="right">';
+print "<form method=\"post\" action=\"stock.php\">";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
+print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print "</td>\n";
+print "</tr>\n";
+print '<br>';
+print '</table>';
+print '<br>';
+
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js
index eb0ef03f257..caf0cd94abd 100644
--- a/htdocs/cashdesk/javascript/dhtml.js
+++ b/htdocs/cashdesk/javascript/dhtml.js
@@ -16,7 +16,7 @@
  */
 
 // Instanciation et initialisation de l'objet xmlhttprequest
-function file (fichier) {
+function file(fichier) {
 
 	// Instanciation de l'objet pour Mozilla, Konqueror, Opera, Safari, etc ...
 	if (window.XMLHttpRequest) {
@@ -51,7 +51,7 @@ function file (fichier) {
 
 
 // Affichage des donnees aTexte dans le bloc identifie par aId
-function afficheDonnees (aId, aTexte) {
+function afficheDonnees(aId, aTexte) {
 
 	document.getElementById(aId).innerHTML = aTexte;
 
@@ -59,7 +59,7 @@ function afficheDonnees (aId, aTexte) {
 
 
 // aCible : id du bloc de destination; aCode : argument a passer a la page php chargee du traitement et de l'affichage
-function verifResultat (aCible, aCode) {
+function verifResultat(aCible, aCode) {
 	if (aCode != '') {
 
 		if (texte = file ('facturation_dhtml.php?code='+escape(aCode))) {
@@ -76,21 +76,9 @@ function verifResultat (aCible, aCode) {
 
 
 // Change dynamiquement la classe de l'element ayant l'id aIdElement pour aClasse
-function setStyle (aIdElement, aClasse) {
+function setStyle(aIdElement, aClasse) {
 
 	aIdElement.className = aClasse;
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/htdocs/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js
index 11f1739e937..b0b9a45a028 100644
--- a/htdocs/cashdesk/javascript/facturation1.js
+++ b/htdocs/cashdesk/javascript/facturation1.js
@@ -16,7 +16,7 @@
  */
 
 // Calcul et affichage en temps reel des informations sur le produit en cours
-function modif () {
+function modif() {
 
 	var prix_unit = parseFloat ( document.getElementById('frmQte').txtPrixUnit.value );
 	var qte = parseFloat ( document.getElementById('frmQte').txtQte.value );
@@ -71,7 +71,7 @@ function modif () {
 }
 
 // Affecte la source de la requete (liste deroulante ou champ texte 'ref') au champ cache
-function setSource (aSrc) {
+function setSource(aSrc) {
 
 	document.getElementById('frmFacturation').hdnSource.value = aSrc;
 	document.getElementById('frmFacturation').submit();
@@ -79,7 +79,7 @@ function setSource (aSrc) {
 }
 
 // Verification de la coherence des informations saisies dans le formulaire de choix du nombre d'articles
-function verifSaisie () {
+function verifSaisie() {
 
 	if ( document.getElementById('frmQte').txtQte.value ) {
 
@@ -95,17 +95,17 @@ function verifSaisie () {
 }
 
 // Verification de la coherence des informations saisies dans le formulaire de calcul de la difference
-function verifDifference () {
+function verifDifference() {
 
 	var du = parseFloat ( document.getElementById('frmDifference').txtDu.value );
 	var encaisse = parseFloat ( document.getElementById('frmDifference').txtEncaisse.value );
 
-	if ( encaisse > du ) {
+	if (encaisse > du) {
 
 		resultat = Math.round ( (encaisse - du) * 100 ) / 100;
 		document.getElementById('frmDifference').txtRendu.value = resultat.toFixed(2);
 
-	} else if ( encaisse == du ) {
+	} else if (encaisse == du) {
 
 		document.getElementById('frmDifference').txtRendu.value = '0';
 
@@ -118,14 +118,14 @@ function verifDifference () {
 }
 
 // Affecte le moyen de paiement (ESP, CB ou CHQ) au champ cache en fonction du bouton clique
-function verifClic (aChoix) {
+function verifClic(aChoix) {
 
 	document.getElementById('frmDifference').hdnChoix.value = aChoix;
 
 }
 
 // Determination du moyen de paiement, et validation du formulaire si les donnees sont coherentes
-function verifReglement () {
+function verifReglement() {
 
 	var choix = document.getElementById('frmDifference').hdnChoix.value;
 	var du = parseFloat (document.getElementById('frmDifference').txtDu.value);
@@ -172,5 +172,4 @@ function verifReglement () {
 		return false;
 
 	}
-
 }
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 9d98823289c..5ad26b0fa38 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1045,7 +1045,7 @@ if ($id > 0)
 		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
         // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
+        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
 
 		$rowspan=4;
 		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d0dd842cd7c..8a4df52748c 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -530,6 +530,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
+				$var=!$var;
 				print "<tr ".$bc[$var].">";
 				print '<td class="nowrap"><a href="propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a>'."\n";
 				if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 )
@@ -539,7 +540,6 @@ if ($id > 0)
 				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td align="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>';
-				$var=!$var;
 				$i++;
 			}
 			$db->free($resql);
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index c15bc9831ce..14ca4448a7c 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -40,10 +40,8 @@ class box_task extends ModeleBoxes
 	var $info_box_contents = array();
 
 	/**
-	*      \brief      Constructeur de la classe
-	*
-	*  @return	void
-	*/
+	 *  Constructor
+	 */
 	function box_task()
 	{
 		global $langs;
@@ -126,7 +124,7 @@ class box_task extends ModeleBoxes
 		$this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
 		$this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
 		$this->info_box_contents[$i][5] = array('td' => '', 'text' => "");
-		
+
 	}
 
 	/**
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 7d0bf5fad0c..5620e641df0 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -54,7 +54,6 @@ class CSMSFile
 	 *	@param 	int		$deferred			Deferred or not
 	 *	@param 	int		$priority			Priority
 	 *	@param 	int		$class				Class
-	 *	@return	int
 	 */
 	function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
 	{
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index 68241cb4d62..d7f765fa510 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -40,7 +40,6 @@ class AntiVir
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
-	 *	@return AntiVir
 	 */
 	function __construct($db)
 	{
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index ece24bfee34..238cd171a5a 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -72,8 +72,6 @@ class Conf
 
 	/**
 	 * Constructor
-	 *
-	 * @return Conf
 	 */
 	function __construct()
 	{
@@ -367,6 +365,26 @@ class Conf
 			unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);
 		}
 
+		if (! empty($conf->productbatch->enabled))
+		{
+			$this->global->STOCK_CALCULATE_ON_BILL=0;
+			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0;
+			$this->global->STOCK_CALCULATE_ON_SHIPMENT=1;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1;
+		}
+
+		if (! empty($conf->productbatch->enabled))
+		{
+			$this->global->STOCK_CALCULATE_ON_BILL=0;
+			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0;
+			$this->global->STOCK_CALCULATE_ON_SHIPMENT=1;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1;
+		}
+
 		// conf->currency
 		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR';
 		$this->currency=$this->global->MAIN_MONNAIE;
@@ -376,7 +394,7 @@ class Conf
 
         // By default, suppliers ojbects can be linked to all projects
         $conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
-        
+
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
 		$this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT;
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 9844e6b74c9..7cddd4c16f5 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -40,7 +40,6 @@ class DolGeoIP
 	 *
 	 * @param 	string	$type		'country' or 'city'
 	 * @param	string	$datfile	Data file
-	 * @return 	GeoIP
 	 */
 	function __construct($type,$datfile)
 	{
diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index 71ee2a1be37..b6e09547743 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -45,7 +45,6 @@ class dolprintIPP
      * @param   string      $userid     userid
      * @param   string      $user       user
      * @param   string      $password   password
-     * @return  printIPP
      */
     function __construct($db,$host,$port,$userid,$user,$password)
     {
@@ -90,7 +89,7 @@ class dolprintIPP
         global $conf,$db;
 
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        
+
         $ipp = new CupsPrintIPP();
         $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
         $ipp->setHost($this->host);
@@ -121,12 +120,12 @@ class dolprintIPP
             	}
             }
         }
-        
+
         // Set number of copy
         $ipp->setCopies($obj->copy);
         $ipp->setData(DOL_DATA_ROOT.'/'.$module.'/'.$file);
         $ipp->printJob();
-        
+
         return '';
     }
 
diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php
index 7f36c6f0d99..b0649f575fc 100644
--- a/htdocs/core/class/google.class.php
+++ b/htdocs/core/class/google.class.php
@@ -36,7 +36,6 @@ class GoogleAPI
 	 *
 	 * @param 	DoliDB		$db			Database handler
 	 * @param	string		$key		Google key
-	 * @return 	GoogleAPI
 	 */
 	function __construct($db,$key)
 	{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 9a419e53d89..8e749cfa9b7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -133,9 +133,10 @@ class FormFile
                 if ($perm)
                 {
                 	$langs->load('other');
-                    $out .= ' ('.$langs->trans("MaxSize").': '.$max.' '.$langs->trans("Kb");
-                    $out .= ' '.info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
-                    $out .= ')';
+                    //$out .= ' ('.$langs->trans("MaxSize").': '.$max.' '.$langs->trans("Kb");
+                    $out .= ' ';
+                    $out.=info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+                    //$out .= ')';
                 }
             }
             else
@@ -779,7 +780,7 @@ class FormFile
 
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-			$var=false;
+			$var=true;
 			foreach($filearray as $key => $file)      // filearray must be only files here
 			{
 				if ($file['name'] != '.'
diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php
index 72d192a7614..297058698aa 100644
--- a/htdocs/core/class/mobiledetect.class.php
+++ b/htdocs/core/class/mobiledetect.class.php
@@ -637,6 +637,11 @@ class MobileDetect
         return null;
     }
 
+    /**
+     * getMobileHeaders
+     *
+     * @return	string		mobile Headers
+     */
     public function getMobileHeaders()
     {
         return self::$mobileHeaders;
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 5165dcb4994..a5e01998ecd 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -247,6 +247,12 @@ class SimpleOpenID
         }
     }
 
+    /**
+     * array2url
+     *
+     * @param 	array	$arr		An array
+     * @return boolean|string		false if KO, string of url if OK
+     */
     function array2url($arr)
     { // converts associated array to URL Query String
         if (!is_array($arr)){
@@ -259,6 +265,14 @@ class SimpleOpenID
         return $query;
     }
 
+    /**
+     * FSOCK_Request
+     *
+     * @param string 	$url		URL
+     * @param string	$method		Method
+     * @param string	$params		Params
+     * @return boolean|unknown
+     */
     function FSOCK_Request($url, $method="GET", $params = "")
     {
         $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
@@ -283,6 +297,14 @@ class SimpleOpenID
         }
     }
 
+    /**
+     * CURL_Request
+     *
+     * @param 	string	$url		URL
+     * @param 	string	$method		Method
+     * @param 	string	$params		Params
+     * @return boolean|unknown
+     */
     function CURL_Request($url, $method="GET", $params = "")
     { // Remember, SSL MUST BE SUPPORTED
         if (is_array($params)) $params = $this->array2url($params);
@@ -305,6 +327,12 @@ class SimpleOpenID
         return $response;
     }
 
+    /**
+     * HTML2OpenIDServer
+     *
+     * @param string	$content	Content
+     * @return array				Array of servers
+     */
     function HTML2OpenIDServer($content)
     {
         $get = array();
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 7e0333bc5aa..7c5c4898fce 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -2,6 +2,7 @@
 /* Copyright (C) phpBSM
  * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
  * bugs, to add new features and to dramatically increase speed.
@@ -39,6 +40,7 @@ require_once '../main.inc.php';
 
 if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
+$langs->load("agenda");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
 
@@ -57,7 +59,7 @@ if (GETPOST('mode') && GETPOST('mode') == 'test')
 }
 else
 {
-	print '<title>Calendar</title>';
+	print '<title>'.$langs->trans("Calendar").'</title>';
 }
 
 // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8)
@@ -183,6 +185,19 @@ function displayBox($selectedDate,$month,$year)
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
 	<tr class="dpDayNames">
+	<?php
+	$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+	if($startday==1)
+	{?>
+		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>     
+	<?php
+	}else {?>	
 		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
 		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
@@ -190,6 +205,8 @@ function displayBox($selectedDate,$month,$year)
 		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<?php
+	}?>
 	</tr>
 	<?php
 	//print "x ".$thedate." y";
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index a8f9e9aff50..0f86f01693c 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -53,7 +53,6 @@ class DoliDBMssql extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-	 *	@return	    int					1 if OK, 0 if not
      */
 	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index dc0cbb1cb1b..bd3e77f37d5 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -50,7 +50,6 @@ class DoliDBMysql extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-	 *	@return	    int					1 if OK, 0 if not
 	 */
 	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 9ec495f7ca5..cd692db677c 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -50,7 +50,6 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-	 *	@return	    int					1 if OK, 0 if not
      */
     function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
@@ -357,7 +356,6 @@ class DoliDBMysqli extends DoliDB
      *	@return int		    Nombre de lignes
      *	@see    num_rows
      */
-
     function affected_rows($resultset)
     {
         // If resultset not provided, we take the last used by connexion
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index a7baf59783d..c1bc48c0aaf 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -60,7 +60,6 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-	 *	@return	    int					1 if OK, 0 if not
 	 */
 	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 53ecb880dce..d19786bb815 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -50,7 +50,6 @@ class DoliDBSqlite extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-	 *	@return	    int					1 if OK, 0 if not
      */
     function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 72c36761386..7565aae8211 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -47,6 +47,14 @@ function SetXmlHeaders()
 	header('Content-Type: text/xml; charset=utf-8');
 }
 
+/**
+ * CreateXmlHeader
+ *
+ * @param string	$command		Command
+ * @param string	$resourceType	Resource type
+ * @param string	$currentFolder	Current folder
+ * @return void
+ */
 function CreateXmlHeader( $command, $resourceType, $currentFolder )
 {
 	SetXmlHeaders();
@@ -63,6 +71,11 @@ function CreateXmlHeader( $command, $resourceType, $currentFolder )
 	$GLOBALS['HeaderSent'] = true ;
 }
 
+/**
+ * CreateXmlFooter
+ *
+ * @return void
+ */
 function CreateXmlFooter()
 {
 	echo '</Connector>' ;
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 6369ac9d3ae..fad4926bc4e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -53,6 +53,13 @@ function GetFolders( $resourceType, $currentFolder )
 	echo "</Folders>" ;
 }
 
+/**
+ * GetFoldersAndFiles
+ *
+ * @param	string	$resourceType	Resource type
+ * @param	string	$currentFolder	Current folder
+ * @return void
+ */
 function GetFoldersAndFiles( $resourceType, $currentFolder )
 {
 	// Map the virtual path to the local server path.
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index 810f75601b6..23d4eb79d77 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -35,13 +35,18 @@ if ( !$Config['Enabled'] )
 
 DoResponse();
 
+/**
+ * DoResponse
+ *
+ * @return void
+ */
 function DoResponse()
 {
     if (!isset($_GET)) {
         global $_GET;
     }
 	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
-		return ;
+		return;
 
 	// Get the main request informaiton.
 	$sCommand		= $_GET['Command'] ;
@@ -60,7 +65,7 @@ function DoResponse()
 	if ( $sCommand == 'FileUpload' )
 	{
 		FileUpload($sResourceType, $sCurrentFolder, $sCommand);
-		return ;
+		return;
 	}
 
 	CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
@@ -70,16 +75,16 @@ function DoResponse()
 	{
 		case 'GetFolders' :
 			GetFolders($sResourceType, $sCurrentFolder);
-			break ;
+			break;
 		case 'GetFoldersAndFiles' :
 			GetFoldersAndFiles($sResourceType, $sCurrentFolder);
-			break ;
+			break;
 		case 'CreateFolder' :
 			CreateFolder($sResourceType, $sCurrentFolder);
-			break ;
+			break;
 	}
 
 	CreateXmlFooter();
 
-	exit ;
+	exit;
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 4183b0e0573..7f3dd4738db 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -115,11 +115,18 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
 	return CombinePaths($sResourceTypePath, $folderPath);
 }
 
-function GetParentFolder( $folderPath )
+/**
+ * GetParentFolder
+ *
+ * @param	string	$folderPath		Folder path
+ * @return 	string					Parent folder
+ */
+function GetParentFolder($folderPath)
 {
 	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
 	return preg_replace($sPattern, '', $folderPath);
 }
+
 /**
  * CreateServerFolder
  *
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
index cf329590aed..664ffbf2bdb 100644
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ b/htdocs/core/filemanagerdol/connectors/php/upload.php
@@ -27,7 +27,14 @@ require 'util.php';
 require 'io.php';
 require 'commands.php';
 
-function SendError( $number, $text )
+/**
+ * SendError
+ *
+ * @param	string	$number		Number
+ * @param	string	$text		Text
+ * @return 	void
+ */
+function SendError($number, $text)
 {
 	SendUploadResults($number, '', '', $text);
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3ad081b1158..5c0040a74b9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1028,6 +1028,8 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
  */
 function dol_getdate($timestamp,$fast=false)
 {
+	global $conf;
+
 	$usealternatemethod=false;
 	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
 	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
@@ -1039,6 +1041,19 @@ function dol_getdate($timestamp,$fast=false)
 	else
 	{
 		$arrayinfo=getdate($timestamp);
+
+		$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+		if($startday==1)
+		{
+			if ($arrayinfo["wday"]==0)
+			{
+				$arrayinfo["wday"]=6;
+			}
+			else
+			{
+				$arrayinfo["wday"]=$arrayinfo["wday"]-1;
+			}
+		}
 	}
 
 	return $arrayinfo;
@@ -1101,11 +1116,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 				$default_timezone=@date_default_timezone_get();
 			}
 		}
-		
+
 		if (empty($localtz)) {
 			$localtz = new DateTimeZone('UTC');
 		}
-		
+
 		$dt = new DateTime(null,$localtz);
 		$dt->setDate($year,$month,$day);
 		$dt->setTime((int) $hour, (int) $minute, (int) $second);
@@ -3580,7 +3595,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
  *	Return yes or no in current language
  *
  *	@param	string	$yesno			Value to test (1, 'yes', 'true' or 0, 'no', 'false')
- *	@param	string	$case			1=Yes/No, 0=yes/no
+ *	@param	string	$case			1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Yes/No
  *	@param	int		$color			0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
  *	@return	string					HTML string
  */
@@ -3590,12 +3605,20 @@ function yn($yesno, $case=1, $color=0)
 	$result='unknown';
 	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
 	{
-		$result=($case?$langs->trans("Yes"):$langs->trans("yes"));
+		$result=$langs->trans('yes');
+		if ($case == 1 || $case == 3) $result=$langs->trans("Yes");
+		if ($case == 2) $result='<input type="checkbox" value="1" checked="checked" disabled="disabled">';
+		if ($case == 3) $result='<input type="checkbox" value="1" checked="checked" disabled="disabled"> '.$result;
+
 		$classname='ok';
 	}
 	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
-		$result=($case?$langs->trans("No"):$langs->trans("no"));
+		$result=$langs->trans("no");
+		if ($case == 1 || $case == 3) $result=$langs->trans("No");
+		if ($case == 2) $result='<input type="checkbox" value="0" disabled="disabled">';
+		if ($case == 3) $result='<input type="checkbox" value="0" disabled="disabled"> '.$result;
+
 		if ($color == 2) $classname='ok';
 		else $classname='error';
 	}
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 0abec31b6fd..41b7996cbfd 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -126,7 +126,12 @@ function user_prepare_head($object)
 	return $head;
 }
 
-
+/**
+ * Prepare array with list of tabs
+ *
+ * @param 	Group $object		Object group
+ * @return	array				Array of tabs
+ */
 function group_prepare_head($object)
 {
 	global $langs, $conf, $user;
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 0cd30f04d22..6eb358aa99d 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -67,7 +67,7 @@ class modProductBatch extends DolibarrModules
 		$this->config_page_url = array();
 
 		// Dependencies
-		$this->depends = array("modProduct","modStock");		// List of modules id that must be enabled if this module is enabled
+		$this->depends = array("modProduct","modStock","modExpedition","modSupplier");		// List of modules id that must be enabled if this module is enabled. modExpedition is required to manage batch exit (by manual stock decrease on shipment), modSupplier to manage batch entry (after supplier order).
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 543b0724de2..6037f6c77c9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -108,10 +108,10 @@ else {
 		echo '> ';
 		// Show type selector
 		echo $langs->trans("FreeLineOfType");
-		echo ' ';
 		echo '</label>';
+		echo ' ';
 	}
-	else 
+	else
 	{
 		echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 		// Show type selector
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index b4ca3504347..d90d4a4c80c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -84,9 +84,24 @@ if ($id > 0 || ! empty($ref))
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('expeditioncard','globalcard'));
 
+
 /*
  * Actions
  */
+
+$warehousecanbeselectedlater=1;
+if (! empty($conf->productbatch->enabled))
+{
+	if (! (GETPOST('entrepot_id','int') > 0))
+	{
+		$langs->load("errors");
+		setEventMessage($langs->trans("WarhouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
+		header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
+		exit;
+	}
+}
+
+
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -593,7 +608,7 @@ if ($action == 'create')
     print_fiche_titre($langs->trans("CreateASending"));
     if (! $origin)
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorBadParameters").'</div>';
+        setEventMessage($langs->trans("ErrorBadParameters"),'errors');
     }
 
     dol_htmloutput_mesg($mesg);
@@ -771,10 +786,13 @@ if ($action == 'create')
                 print '</td>';
                 if (! empty($conf->stock->enabled))
                 {
-					if (empty($conf->productbatch->enabled)) {
-                    print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Stock").'</td>';
-					} else {
-						print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' / '.$langs->trans("Stock").'</td>';
+					if (empty($conf->productbatch->enabled))
+					{
+                    	print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
+					}
+					else
+					{
+						print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
                 }
                 print "</tr>\n";
@@ -828,7 +846,7 @@ if ($action == 'create')
                     print '</td>';
                 }
                 else
-                {
+				{
                     print "<td>";
                     if ($type==1) $text = img_object($langs->trans('Service'),'service');
                     else $text = img_object($langs->trans('Product'),'product');
@@ -861,17 +879,19 @@ if ($action == 'create')
                 $quantityAsked = $line->qty;
                 $quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 
+                $warehouse_id = GETPOST('entrepot_id','int');
+
                 $defaultqty=0;
-                if (GETPOST('entrepot_id','int') > 0)
+                if ($warehouse_id > 0)
                 {
                     //var_dump($product);
-                    $stock = $product->stock_warehouse[GETPOST('entrepot_id','int')]->real;
+                    $stock = $product->stock_warehouse[$warehouse_id]->real;
                     $stock+=0;  // Convertit en numerique
                     $defaultqty=min($quantityToBeDelivered, $stock);
                     if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0;
                 }
 
-                if (empty($conf->productbatch->enabled) ||  ! ($product->hasbatch() and is_object($product->stock_warehouse[GETPOST('entrepot_id','int')])))
+                if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() and is_object($product->stock_warehouse[$warehouse_id])))
 				{
 	                // Quantity to send
 	                print '<td align="center">';
@@ -892,14 +912,14 @@ if ($action == 'create')
 	                        // Show warehouse combo list
 	                    	$ent = "entl".$indiceAsked;
 	                    	$idl = "idl".$indiceAsked;
-	                    	$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
+	                    	$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
 	                        print $formproduct->selectWarehouses($tmpentrepot_id,'entl'.$indiceAsked,'',1,0,$line->fk_product);
-	                    	if ($tmpentrepot_id > 0 && $tmpentrepot_id == GETPOST('entrepot_id','int'))
+	                    	if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
 	                        {
 	                            //print $stock.' '.$quantityToBeDelivered;
 	                            if ($stock < $quantityToBeDelivered)
 	                            {
-	                                print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for entrepot_id but we may have change warehouse
+	                                print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for this $warehouse_id but you can change warehouse
 	                            }
 	                        }
 	                    }
@@ -934,11 +954,14 @@ if ($action == 'create')
 							}
 						}
 					}
-				} else {
+				}
+				else
+				{
 					print '<td></td><td></td></tr>';
 					$subj=0;
 					print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-					foreach ($product->stock_warehouse[GETPOST('entrepot_id','int')]->detail_batch as $dbatch) {
+					foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
+					{
 						//var_dump($dbatch);
 						$substock=$dbatch->qty +0 ;
 						print '<tr><td colspan="3" ></td><td align="center">';
@@ -946,8 +969,13 @@ if ($action == 'create')
 						print '</td>';
 
 						print '<td align="left">';
+
+						$staticwarehouse=new Entrepot($db);
+						$staticwarehouse->fetch($warehouse_id);
+						print $staticwarehouse->getNomUrl(0).' / ';
+
 						print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
-						print $langs->trans("DetailBatchFormat", dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->batch, $dbatch->qty);
+						print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
 						if ($defaultqty<=0) {
 							$defaultqty=0;
 						} else {
@@ -1451,12 +1479,14 @@ else if ($id || $ref)
 			}
 
 			// Batch number managment
-			if (! empty($conf->productbatch->enabled)) {
-				if (isset($lines[$i]->detail_batch) ) {
-					print '<td align="center">';
+			if (! empty($conf->productbatch->enabled))
+			{
+				if (isset($lines[$i]->detail_batch))
+				{
+					print '<td>';
 					$detail = '';
 					foreach ($lines[$i]->detail_batch as $dbatch) {
-						$detail.= $langs->trans("DetailBatchFormat",dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->batch,$dbatch->dluo_qty).'<br/>';
+						$detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).'<br/>';
 					}
 					print $form->textwithtooltip($langs->trans("DetailBatchNumber"),$detail);
 					print '</td>';
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index e3cb8305562..2b41a939c7b 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -114,7 +114,7 @@ if ($resql)
 /*
  * Commandes a traiter
  */
-$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -136,7 +136,7 @@ if ($resql)
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
+		print '<td colspan="3">'.$langs->trans("OrdersToProcess").'</td></tr>';
 		$var = True;
 		while ($i < $num)
 		{
@@ -146,13 +146,19 @@ if ($resql)
 			print '<td class="nowrap">';
 			$orderstatic->id=$obj->rowid;
 			$orderstatic->ref=$obj->ref;
+			$orderstatic->statut=$obj->fk_statut;
+			$orderstatic->facturee=0;
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
 			$companystatic->name=$obj->name;
 			$companystatic->id=$obj->socid;
 			print $companystatic->getNomUrl(1,'customer',32);
-			print '</td></tr>';
+			print '</td>';
+			print '<td align="right">';
+			print $orderstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
 			$i++;
 		}
 		print "</table><br>";
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index f1be4b07021..bce365447e1 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -643,7 +643,10 @@ if ($id > 0 || ! empty($ref))
 
 				if (! empty($conf->stock->enabled))
 				{
-					print '<td>'.$langs->trans("WarehouseSource").'</td>';
+					$warehousecanbeselectedlater=1;
+					if (! empty($conf->productbatch->enabled)) $warehousecanbeselectedlater=0;
+
+					print '<td'.($warehousecanbeselectedlater?'':' class="fieldrequired"').'>'.$langs->trans("WarehouseSource").'</td>';
 					print '<td>';
 					print $formproduct->selectWarehouses(-1,'entrepot_id','',1);
 					if (count($formproduct->cache_warehouses) <= 0)
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 3bc492db8e2..ca3e49749ab 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -10,10 +10,11 @@ batch_number=Batch/Serial number
 l_eatby=Eat-by date
 l_sellby=Sell-by date
 DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=E:%s S: %s BATCH: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
\ No newline at end of file
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 2c5560d1d24..d26e84d7a36 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Seleccione un plan contable
 Validate=Validar
 Addanaccount=Añadir una cuenta contable
 AccountAccounting=Cuenta contable
-Ventilation=Breakdown
+Ventilation=Contabilizar
 ToDispatch=A realizar
 Dispatched=Realizadas
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Contabilizar clientes
+SuppliersVentilation=Contabilizar proveedores
 TradeMargin=Margen de beneficio
 Reports=Informes
 ByCustomerInvoice=Por facturas a clientes
@@ -45,9 +45,9 @@ WriteBookKeeping=Registrar los asientos en el libro mayor
 Bookkeeping=Libro Mayor
 AccountBalanceByMonth=Saldo mensual
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Descuadre contabilidad
+AccountingVentilationSupplier=Contablilización compras
+AccountingVentilationCustomer=Contabilización ventas
 Line=Línea
 
 CAHTF=Total (base imponible) compras a proveedor
@@ -56,7 +56,7 @@ InvoiceLinesDone=Líneas de facturas contabilizadas
 IntoAccount=En la cuenta
 
 Ventilate=Contabilizar
-VentilationAuto=Automatic breakdown
+VentilationAuto=Contabilización automática
 
 Processing=Tratamiento
 EndProcessing=Final del tratamiento
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
 
 ACCOUNTING_SEPARATORCSV=Separador CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
 
 AccountLength=Longitud de las cuentas contables mostradas en Dolibarr
 AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas.
@@ -140,14 +140,14 @@ Active=Estado
 
 NewFiscalYear=Nuevo año fiscal
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Consulte aquí la contabilización anual de sus facturas a clientes
 TotalVente=Total ventas (base imponible)
 TotalMarge=Total margen ventas
 DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y sus cuentas contables
 DescVentilTodoCustomer=Contabilice sus líneas de facturas a clientes con una cuenta contable
 ChangeAccount=Cambie la cuenta para las líneas seleccionadas a la cuenta:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consulte aquí la contabilidad anual de sus facturas de proveedores
 DescVentilTodoSupplier=Contabilize sus líneas de facturas de proveedores
 DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
 
@@ -155,4 +155,4 @@ ValidateHistory=Validar automáticamente
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
 
-FicheVentilation=Breakdown card
+FicheVentilation=Ficha contable
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 8637f7088db..2deac3d4278 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de productos
 Module52Desc=Gestión de stocks de productos
 Module53Name=Servicios
 Module53Desc=Gestión de servicios
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contratos/Suscripciones
+Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestión de los códigos de barras
 Module56Name=Telefonía
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
 Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestión de marcadores
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Proyectos/Oportunidades
+Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -495,6 +495,8 @@ Module1780Name=Categorías
 Module1780Desc=Gestión de categorías (productos, proveedores y clientes)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado
+Module2200Name=Precios dinámicos
+Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Programador
 Module2300Desc=Tareas programadas
 Module2400Name=Agenda
@@ -503,6 +505,8 @@ Module2500Name=Gestión Electrónica de Documentos
 Module2500Desc=Permite administrar una base de documentos
 Module2600Name=WebServices
 Module2600Desc=Activa los servicios de servidor web services de Dolibarr
+Module2650Name=WebServices (cliente)
+Module2650Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor)
 Module2700Name=Gravatar
 Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet
 Module2800Desc=Cliente FTP
@@ -517,7 +521,7 @@ Module6000Desc=Gestión del flujo de trabajo
 Module20000Name=Gestión de días libres retribuidos
 Module20000Desc=Gestión de los días libres retribuidos de los empleados
 Module39000Name=Lotes de productos
-Module39000Desc=Gestión de lotes y fechas de caducidad y venta de los productos
+Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos
 Module50000Name=PayBox
 Module50000Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paybox
 Module50100Name=TPV
@@ -606,11 +610,11 @@ Permission151=Consultar domiciliaciones
 Permission152=Crear/modificar domiciliaciones
 Permission153=Enviar domiciliaciones
 Permission154=Abonar/devolver domiciliaciones
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Consultar contratos/suscripciones
+Permission162=Crear/modificar contratos/suscripciones
+Permission163=Activar un servicio/suscripción de un contrato
+Permission164=Desactivar un servicio/suscripcion de un contrato
+Permission165=Eliminar contratos/suscripciones
 Permission171=Leer honorarios (propios y de sus subordinados)
 Permission172=Crear/modificar honorarios
 Permission173=Eliminar honorarios
@@ -672,7 +676,7 @@ Permission300=Consultar códigos de barras
 Permission301=Crear/modificar códigos de barras
 Permission302=Eliminar código de barras
 Permission311=Consultar servicios
-Permission312=Assign service/subscription to contract
+Permission312=Asignar servicios/suscripciones a un contrato
 Permission331=Consultar marcadores
 Permission332=Crear/modificar marcadores
 Permission333=Eliminar marcadores
@@ -702,8 +706,8 @@ Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
 Permission1001=Consultar stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Crear/modificar almacenes
+Permission1003=Eliminar almacenes
 Permission1004=Consultar movimientos de stock
 Permission1005=Crear/modificar movimientos de stock
 Permission1101=Consultar ordenes de envío
@@ -1138,7 +1142,7 @@ AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío
 UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad nula se considera como una opción
 FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### Orders #####
 OrdersSetup=Configuración del módulo pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1160,7 +1164,7 @@ FicheinterNumberingModules=Módulos de numeración de las fichas de intervenció
 TemplatePDFInterventions=Modelo de documentos de las fichas de intervención
 WatermarkOnDraftInterventionCards=Marca de agua en fichas de intervención (en caso de estar vacío)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configuración del módulo Contratos/suscripciones
 ContractsNumberingModules=Módulos de numeración de los contratos
 TemplatePDFContracts=Modelos de documento de contratos
 FreeLegalTextOnContracts=Texto libre en contratos
@@ -1324,7 +1328,7 @@ FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor
 CacheByServer=Caché mediante el servidor
 CacheByClient=Caché mediante el navegador
 CompressionOfResources=Compresión de las respuestas HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
 ##### Products #####
 ProductSetup=Configuración del módulo Productos
 ServiceSetup=Configuración del módulo Servicios
@@ -1415,9 +1419,9 @@ OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario
 OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar.
 OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configuración del módulo Almacenes
+UserWarehouse=Utilizar almacenes personales de usuarios
+IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
 TreeMenu=Estructura de los menús
@@ -1482,14 +1486,14 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
 ##### Point Of Sales (CashDesk) #####
 CashDesk=TPV
 CashDeskSetup=Configuración del módulo Terminal Punto de Venta
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
 CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
 CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
 CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Desactivar decrementos de stock si una venta se realiza desde TPV
+CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
+StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
+CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
 BookmarkDesc=Este módulo le permite gestionar los enlaces y accesos directos. También permite añadir cualquier página de Dolibarr o enlace web en el menú de acceso rápido de la izquierda.
@@ -1543,13 +1547,13 @@ ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
 Opened=Abierto
 Closed=Cerrado
 AlwaysEditable=Puede editarse siempre
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
+NbMajMin=Número mínimo de caracteres en mayúsculas
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiales
+NbIteConsecutive=Número máximo de repeticiones de los mismos caracteres
+NoAmbiCaracAutoGeneration=No usar caracteres ambiguos ("1","l","i","|","0","O") para la generación automática
+SalariesSetup=Configuración del módulo salarios
+SortOrder=Ordenación
 Format=Formatear 
 TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index c1085fe2b4c..feb1581d674 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -44,7 +44,7 @@ AgendaExtSitesDesc=Esta página le permite configurar calendarios externos para
 ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma automática
 PropalValidatedInDolibarr=Presupuesto %s validado
 InvoiceValidatedInDolibarr=Factura %s validada
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
 InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
 OrderValidatedInDolibarr= Pedido %s validado
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 2f90ce489e7..7e4a1e1376d 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Ninguna factura
 ClassifyBill=Clasificar la factura
 SupplierBillsToPay=Facturas de proveedores a pagar
 CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Las facturas escritas a través de procedimientos mecanograficos son dispensadas por la orden en letras
 NonPercuRecuperable=No percibido recuperable
 SetConditions=Definir condiciones de pago
 SetMode=Definir modo de pago
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 51c6e4e094b..e4d86be11bd 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Configuración de categorías
 CategorieRecursiv=Enlazar con la categoría padre automáticamente
 CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-ShowCategory=Show category
+ShowCategory=Mostrar categoría
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index a8172d5d5b8..ded2c3c764e 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -108,7 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contable incorrecto para %s
 SuppliersProductsSellSalesTurnover=Volumen de ventas generado por la venta de los productos de los proveedores
 CheckReceipt=Lista de remesas
 CheckReceiptShort=Remesas
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=%s Últimas remesas
 NewCheckReceipt=Nueva remesa
 NewCheckDeposit=Nuevo ingreso
 NewCheckDepositOn=Crear nueva remesa en la cuenta: %s
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index af08e1c1aaf..6e8cc61b5c4 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Área contratos
 ListOfContracts=Listado de contratos
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=%s Últimos contratos modificados
 AllContracts=Todos los contratos
 ContractCard=Ficha contrato
 ContractStatus=Estado del contrato
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listado de líneas de contratos en servicio
 ListOfRunningServices=Listado de servicios activos
 NotActivatedServices=Servicios no activados (con los contratos validados)
 BoardNotActivatedServices=Servicios a activar con los contratos validados
-LastContracts=Last % contracts
+LastContracts=%s Últimos contratos
 LastActivatedServices=Los %s últimos servicios activados
 LastModifiedServices=Los %s últimos servicios modificados
 EditServiceLine=Edición línea del servicio
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 75a14a528b7..883b32aefa9 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=En entorno Unix debes usar crontab para ejecutar el coma
 CronExplainHowToRunWin=En un entorno de Microsoft(tm) Windows puedes usar el programador de tareas para ejecutar el comando cada varios minutos
 # Menu
 CronJobs=Tareas programadas
-CronListActive=List of active/scheduled jobs
+CronListActive=Listado de tareas activas/programadas
 CronListInactive=Tareas Inactivas
 # Page list
 CronDateLastRun=Últ. ejec.
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index 27cb070685b..dda4508af8a 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Beneficiario
 ThankYou=Muchas gracias
 IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad
 MinimumAmount=El importe mínimo es %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Texto libre a mostrar a pié de página
+FrenchOptions=Opciones para Francia
+DONATION_ART200=Mostrar artículo 200 del CGI si se está interesado
+DONATION_ART238=Mostrar artículo 238 del CGI si se está interesado
+DONATION_ART885=Mostrar artículo 885 del CGI si se está interesado
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 7ac24f97c46..71715c703db 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no es
 ErrorThereIsSomeDeliveries=Error, hay entregas vinculadas a este envío. No se puede eliminar.
 ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que ha generado una transacción bancaria que se encuentra conciliada
 ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago de varias factura con alguna factura con estado Pagada
+ErrorPriceExpression1=No se puede asignar a la constante '%s'
+ErrorPriceExpression2=No se puede redefinir la función incorporada '%s'
+ErrorPriceExpression3=Variable '%s' no definida en la definición de la función
+ErrorPriceExpression4=Carácter '%s' ilegal
+ErrorPriceExpression5=No se esperaba '%s'
+ErrorPriceExpression6=Número de argumentos inadecuados (%s dados, %s esperados) 
+ErrorPriceExpression8=Operador '%s' no esperado
+ErrorPriceExpression9=Ha ocurrido un error no esperado
+ErrorPriceExpression10=Operador '%s' carece de operando
+ErrorPriceExpression11=Se esperaba '%s'
+ErrorPriceExpression14=División por cero
+ErrorPriceExpression17=Variable '%s' indefinida
+ErrorPriceExpression19=Expresión no encontrada
+ErrorPriceExpression20=Expresión vacía
+ErrorPriceExpression21=Resultado '%s' vacío
+ErrorPriceExpression22=Resultado '%s' negativo
+ErrorPriceExpressionInternal=Error interno '%s'
+ErrorPriceExpressionUnknown=Error desconocido '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
index d67d5d8125e..973ff6db361 100644
--- a/htdocs/langs/es_ES/externalsite.lang
+++ b/htdocs/langs/es_ES/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Configuración del enlace al sitio web externo
 ExternalSiteURL=URL del sitio externo
 ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Mi entrada de menú
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index 2db13d0c487..d674f45fc5d 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -31,14 +31,14 @@ RelatedInterventions=Intervenciones adjuntas
 ShowIntervention=Mostrar intervención
 SendInterventionRef=Envío de la intervención %s
 SendInterventionByMail=Enviar intervención por e-mail
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+InterventionCreatedInDolibarr=Intervención %s creada
+InterventionValidatedInDolibarr=Intervención %s validada
+InterventionModifiedInDolibarr=Intervención %s modificada
+InterventionClassifiedBilledInDolibarr=Intervención %s clasificada como facturada
+InterventionClassifiedUnbilledInDolibarr=Intervención %s clasificada como no facturada
+InterventionSentByEMail=Intervención %s enviada por E-Mail
+InterventionDeletedInDolibarr=Intervención %s eliminada
+SearchAnIntervention=Buscar una intervención
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguimiento de la intervención
 TypeContact_fichinter_internal_INTERVENING=Interventor
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 65885aaa6d0..6c154537764 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviado por
 MailingNeedCommand=Por razones de seguridad, el envío de un E-Mailing en masa debe realizarse en línea de comandos. Pida a su administrador que lance el comando siguiente para para enviar la correspondencia a a todos los destinatarios:
 MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios.
 ConfirmSendingEmailing=¿Confirma el envío del e-mailing?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Nota: El envío de e-mailings desde la interfaz web se realiza en tandas por razones de seguridad y timeouts, se enviarán a <b>%s</b> destinatarios por tanda.
 TargetsReset=Vaciar lista
 ToClearAllRecipientsClickHere=Para vaciar la lista de los destinatarios de este E-Mailing, haga click en el botón
 ToAddRecipientsChooseHere=Para añadir destinatarios, escoja los que figuran en las listas a continuación
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
 AddNewNotification=Activar un nuevo destinatario de notificaciones
 ListOfActiveNotifications=Listado de todos los destinatarios de notificaciones
 ListOfNotificationsDone=Listado de notificaciones enviadas
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
+MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
+MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 209c6be9ef7..0f13a2540a2 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -367,7 +367,7 @@ ActionsOnCompany=Eventos respecto a este tercero
 ActionsOnMember=Eventos respecto a este miembro
 NActions=%s eventos
 NActionsLate=%s en retraso
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Solicitud ya registrada
 Filter=Filtro
 RemoveFilter=Eliminar filtro
 ChartGenerated=Gráficos generados
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index f16c868e593..2094ff8761a 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -41,4 +41,4 @@ AgentContactType=Tipo de contacto comisionado
 AgentContactTypeDetails=Indique qué tipo de contacto (enlazado a las facturas) será el utilizado para el informe de márgenes de agentes comerciales
 rateMustBeNumeric=El margen  debe ser un valor numérico
 markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
-ShowMarginInfos=Show margin infos
+ShowMarginInfos=Mostrar info de márgenes
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index dd1989dbb48..afff6708e0d 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -203,3 +203,4 @@ MembersByNature=Miembros por naturaleza
 VATToUseForSubscriptions=Tasa de IVA para las afiliaciones
 NoVatOnSubscription=Sin IVA para en las afiliaciones
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail para advertir en caso de recepción de confirmación de un pago validado de una afiliación
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 474753385db..67002f7d105 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Existe una expedición
 DraftOrWaitingApproved=Borrador o aprobado aún no controlado
 DraftOrWaitingShipped=Borrador o validado aún no expedido
 MenuOrdersToBill=Pedidos a facturar
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Pedidos facturables
 SearchOrder=Buscar un pedido
 SearchACustomerOrder=Buscar un pedido de cliente
 ShipProduct=Enviar producto
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 1b2319ae9a1..fe430c2878c 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -203,26 +203,26 @@ ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este e
 
 ##### Calendar common #####
 AddCalendarEntry=Añadir entrada en el calendario
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Empresa %s añadida
+ContractValidatedInDolibarr=Contrato %s validado
+ContractCanceledInDolibarr=Contrato %s cancelado
+ContractClosedInDolibarr=Contrato %s cerrado
+PropalClosedSignedInDolibarr=Presupuesto %s firmado
+PropalClosedRefusedInDolibarr=Presupuesto %s rechazado
+PropalValidatedInDolibarr=Presupuesto %s validado
+PropalClassifiedBilledInDolibarr=Presupuesto %s clasificado facturado
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoicePaidInDolibarr=Factura %s pasada a pagada
+InvoiceCanceledInDolibarr=Factura %s cancelada
+PaymentDoneInDolibarr=Pago %s realizado
+CustomerPaymentDoneInDolibarr=Pago de cliente %s realizado
+SupplierPaymentDoneInDolibarr=Pago a proveedor %s realizado
+MemberValidatedInDolibarr=Miembro %s validado
+MemberResiliatedInDolibarr=Miembro %s dado de baja
+MemberDeletedInDolibarr=Miembro %s eliminado
+MemberSubscriptionAddedInDolibarr=Subscripción del miembro %s añadida
+ShipmentValidatedInDolibarr=Expedición %s validada
+ShipmentDeletedInDolibarr=Expedición %s eliminada
 ##### Export #####
 Export=Exportación
 ExportsArea=Área de exportaciones
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index 91846ce244e..0ebdba0ae8b 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Mensaje en la página de retorno de pago cancelado
 NewPayboxPaymentReceived=Nuevo pago Paybox recibido
 NewPayboxPaymentFailed=Nuevo intento de pago Paybox sin éxito
 PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Valor para PBX SITE
+PAYBOX_PBX_RANG=valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang
index 241272d262e..b1831a86789 100644
--- a/htdocs/langs/es_ES/printipp.lang
+++ b/htdocs/langs/es_ES/printipp.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuración del módulo Impresión directa IPP
-PrintIPPDesc=Este módulo permite añadir un botón de impresión directa de sus documentos hacia su impresora. Se requiere un sistema Linux equipado con Cups.
-PRINTIPP_ENABLED=Muestra el logo "Impresión directa" en los listados de documentos
+PrintIPPSetup=Configuración del módulo Impresión Directa
+PrintIPPDesc=Este módulo añade un botón para enviar documentos directamente a una impresora. Es necesario un SO Linux con CUPS instalado.
+PRINTIPP_ENABLED=Mostrar icono "Impresión directa" en los listados de documentos
 PRINTIPP_HOST=Servidor de impresión
 PRINTIPP_PORT=Puerto
-PRINTIPP_USER=Login
+PRINTIPP_USER=Usuario
 PRINTIPP_PASSWORD=Contraseña
-NoPrinterFound=No se ha encontrado ninguna impresora (compruebe su configuración Cups)
\ No newline at end of file
+NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS)
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
new file mode 100644
index 00000000000..dd61a420dbc
--- /dev/null
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -0,0 +1,19 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Gestionar lotes/series
+ProductStatusOnBatch=Gestionado
+ProductStatusNotOnBatch=No gestionado
+ProductStatusOnBatchShort=Gestionado
+ProductStatusNotOnBatchShort=No gestionado
+Batch=Lote/Serie
+atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote
+batch_number=Número Lote/Serie
+l_eatby=Fecha de caducidad
+l_sellby=Fecha límite de venta
+DetailBatchNumber=Detalles del lote/serie
+DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d)
+printBatch=Lote: %s
+printEatby=Caducidad: %s
+printSellby=Límite venta: %s
+printQty=Cant.: %d
+AddDispatchBatchLine=Añada una línea para despacho por caducidad
+BatchDefaultNumber=Indefinido
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 1a4726afcc2..693cdfdd193 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clien
 PriceByCustomerLog=Log de precios por clientes
 MinimumPriceLimit=El precio mínimo no puede ser menor de %s
 MinimumRecommendedPrice=El precio mínimo recomendado es: %s
+PriceExpressionEditor=Editor de expresión de precios
+PriceExpressionSelected=Expresión de precios seleccionada
+PriceExpressionEditorHelp="price = 2 + 2" o "2 + 2" para indicar el precio<br>ExtraFields son variables como "#options_myextrafieldkey# * 2"<br>Existen variables especiales como #quantity# y #tva_tx#<br>Use ; para separar expresiones
+PriceMode=Modo precio
+PriceNumeric=Número
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
index d64075dfbf5..5bc252fbce3 100644
--- a/htdocs/langs/es_ES/resource.lang
+++ b/htdocs/langs/es_ES/resource.lang
@@ -1,36 +1,36 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Recursos
+MenuResourceAdd=Nuevo recurso
+MenuResourcePlanning=Planificación de recursos
+DeleteResource=Eliminar recurso
+ConfirmDeleteResourceElement=¿Está seguro de querer eliminar el recurso de este elemento?
+NoResourceInDatabase=Sin recursos en la base de datos.
+NoResourceLinked=Sin recursos enlazados
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Listado de recursos
+ResourceSingular=Recurso
+ResourceCard=Ficha recurso
+AddResource=Crear un recurso
+ResourceFormLabel_ref=Nombre recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descripción recurso
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Recursos enlazados a elemento
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Ver planificación de recursos
+GotoDate=Ir a fecha
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Elementos de recursos
+ResourceCreatedWithSuccess=Recurso creado correctamente
+RessourceLineSuccessfullyDeleted=Línea de recurso eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea de recurso actualizada correctamente
+ResourceLinkedWithSuccess=Recurso enlazado correctamente
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Ficha recurso
+ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso?
+RessourceSuccessfullyDeleted=Recurso eliminado correctamente
+DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modèles d'Emails
+DictionaryEMailTemplates=Modelo de E-Mails
 
-SelectResource=Select resource
+SelectResource=Seleccionar recurso
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 9f6f20a1eb9..4335c234d11 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedició
 RelatedShippings=Expedición(es) asociada(s)
 ShipmentLine=Línea de expedición
 CarrierList=Listado de transportistas
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Ya ha sido enviado el producto del pedido de cliente
+SuppliersReceiptRunning=Ya ha sido recibido el producto del pedido a proveedor
 
 # Sending methods
 SendingMethodCATCH=Recogido por el cliente
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 3a98d9a9add..04f2c864f9d 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=La etiqueta del almacén es obligatoria
 CorrectStock=Corregir stock
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
-StocksArea=Warehouses area
+StocksArea=Área almacenes
 Location=Lugar
 LocationSummary=Nombre corto del lugar
 NumberOfDifferentProducts=Número de productos diferentes
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index b00190c30b3..0440f777da0 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Usuario %s deshailitado
 UserEnabled=Usuario %s activado
 UserDeleted=Usuario %s eliminado
 NewGroupCreated=Grupo %s creado
-GroupModified=Group %s modified
+GroupModified=Grupo %s modificado
 GroupDeleted=Grupo %s eliminado
 ConfirmCreateContact=¿Está seguro de querer crear una cuenta Dolibarr para este contacto?
 ConfirmCreateLogin=¿Está seguro de que desea crear una cuenta Dolibarr para este miembro?
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index ab7be0799b4..1762411d3c8 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -16,7 +16,7 @@ WithdrawedBills=Facturas domiciliadas
 WithdrawalsLines=Lineas de domiciliación
 RequestStandingOrderToTreat=Peticiones de domiciliaciones a procesar
 RequestStandingOrderTreated=Peticiones de domiciliaciones procesadas
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de la domiciliación debe ser 'abonada' antes de poder realizar devoluciones a sus líneas
 CustomersStandingOrders=Domiciliaciones de clientes
 CustomerStandingOrder=Domiciliación cliente
 NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación
@@ -47,7 +47,7 @@ RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
 RefusedInvoicing=Facturación de la devolución
 NoInvoiceRefused=No facturar la devolución
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
 Status=Estado
 StatusUnknown=Desconocido
 StatusWaiting=En espera
@@ -76,7 +76,7 @@ WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
 BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones
 CreditDate=Abonada el
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
 DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 68e76dca46b..83f37508b8d 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number= Numéro de lot
 l_eatby= DLC
 l_sellby= DLUO
 DetailBatchNumber= Détails des lots
-DetailBatchFormat= C:%s UO: %s LOT: %s (Qté : %d)
+DetailBatchFormat= Lot/Serie: %s - C:%s - UO: %s (Qté : %d)
 printBatch= Lot: %s
 printEatby= DLC: %s
 printSellby= DLUO: %s
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7cfb6441c06..057aecc6847 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1122,7 +1122,7 @@ else
 
 			// Batch number managment
 			if ($conf->productbatch->enabled) {
-				print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
+				print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
 				$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
 				print $form->selectarray('status_batch',$statutarray,$object->status_batch);
 				print '</td></tr>';