Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

ChangeLog

@@ -2,7 +2,8 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
-Fix: Bad rounding on margin calculations and display
+Fix: Bad rounding on margin calculations and display.
+Fix: Option drpo table into backup was broken.
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined

build/debian/changelog

@@ -1,5 +1,19 @@
+dolibarr (3.4.2) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+
 dolibarr (3.4.1) unstable; urgency=low
 
+  [ Laurent Destailleur (eldy) ]
+  * Maintenance release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+
+dolibarr (3.4.0) unstable; urgency=low
+
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     

build/exe/doliwamp/doliwamp.iss

@@ -17,9 +17,9 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.4.1
+AppVerName=DoliWamp-3.4.2
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.4.1
+OutputBaseFilename=DoliWamp-3.4.2
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
 ;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx

build/makepack-dolibarr.pl

@@ -10,7 +10,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="4";
-$BUILD="1";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="2";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD
 
 @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages

build/rpm/dolibarr_fedora.spec

@@ -330,5 +330,5 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/rpm/dolibarr_generic.spec

@@ -558,5 +558,5 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/rpm/dolibarr_mandriva.spec

@@ -335,5 +335,5 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/rpm/dolibarr_opensuse.spec

@@ -345,5 +345,5 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

htdocs/admin/tools/dolibarr_export.php

@@ -219,7 +219,7 @@ print $langs->trans("BackupDescY").'<br><br>';
 			<fieldset><legend> <input type="checkbox" name="sql_structure"
 				value="structure" id="checkbox_sql_structure" checked="checked" /> <label
 				for="checkbox_sql_structure"> <?php echo $langs->trans('ExportStructure') ?></label> </legend> <input
-				type="checkbox" name="drop" value="1" id="checkbox_dump_drop" /> <label
+				type="checkbox" name="drop"<?php echo ((! isset($_GET["drop"]) && ! isset($_POST["drop"])) || GETPOST('drop'))?' checked="checked"':''; ?> id="checkbox_dump_drop" /> <label
 				for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br>
 			</fieldset>
 
@@ -274,7 +274,7 @@ print $langs->trans("BackupDescY").'<br><br>';
 
                             <br>
                             <fieldset><legend><?php echo $langs->trans('ExportStructure') ?></legend> <input
-                                    type="checkbox" name="nobin_drop" value="1" id="checkbox_dump_drop" /> <label
+                                    type="checkbox" name="nobin_drop"<?php echo ((! isset($_GET["nobin_drop"]) && ! isset($_POST["nobin_drop"])) || GETPOST('nobin_drop'))?' checked="checked"':''; ?> id="checkbox_dump_drop" /> <label
                                     for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br>
                             </fieldset>
 
@@ -433,4 +433,4 @@ print '<br>';
 llxFooter();
 
 $db->close();
-?>
+?>

htdocs/admin/tools/export.php

@@ -134,7 +134,8 @@ if ($what == 'mysql')
     if (GETPOST("drop_database"))        $param.=" --add-drop-database";
     if (GETPOST("sql_structure"))
     {
-        if (GETPOST("drop"))			 $param.=" --add-drop-table";
+        if (GETPOST("drop"))			$param.=" --add-drop-table=TRUE";
+        else 							$param.=" --add-drop-table=FALSE";
     }
     else
     {

htdocs/filefunc.inc.php

@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.4.1');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.4.2');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants