diff --git a/ChangeLog b/ChangeLog
index ac0f5d5e9c373fc17c1e0a3b9299d5d0f73c4240..763e3369203ce03e52f2e4472680c97c77d5b5b0 100644
--- a/ChangeLog
+++ b/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
diff --git a/build/debian/changelog b/build/debian/changelog
index 11706ff7ff30274ea6241edd70e4615ce4cff9b4..cc9bd706d869aae47e725acd2f19cd710d52e438 100644
--- a/build/debian/changelog
+++ b/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.
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 0f3391a911024d83ab01f4185859a545e755ab1f..98bfeee9109a079f8d2eeba02b03a86405116bac 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/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
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 2da866d221a0e844bb52aa0af60ccea8a0f9a646..05eef72a978665382d10c111ccece0029a2498d5 100755
--- a/build/makepack-dolibarr.pl
+++ b/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
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 60756c8beb66dc79ed20940cefe2ee15fd11a64c..eb7c7305b11cdeb96459f4f0d44106fabc5b8bd6 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/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)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index c5feb63aba4bae56e23ca8d254d00466a8a0f640..4bc224917557946af94b0661a1d1d8e7ff508165 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/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)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 6a9e1dd47d72afa08032c99556749fa44b872d6f..98ef5fa1b44e288887c0fc1f91a66747753643e5 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/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)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 3b41058c4169d84fdb3ebc32e260853f393ebfbb..1734ad6a4e3cb7fc65e6ae3e250bccd007e57d6d 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/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)
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index a0cb8af9726f24d62d849488a34d8a4b8c993a2b..63ef6376df73afc8ca87ed68fb1b4e0df5bcfd65 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/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();
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 31d4ec7ef6684161be750966c46df075375b4974..8dbd7a1912ecb4002bd27532829ae25c930efeb7 100644
--- a/htdocs/admin/tools/export.php
+++ b/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
{
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 3be6cadc9ce02b9375a54e908cc89a81b8a385be..65895a28035338cf06a261aed88bfe97a7147586 100644
--- a/htdocs/filefunc.inc.php
+++ b/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