diff --git a/ChangeLog b/ChangeLog
index efdc41b902a..15d7856881a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ Fix: Mailing module : if an email is already in destinaires list all other email
 Fix: Localtaxes balance not showing
 Fix: Intervention box links to contracts id
 Fix: Compatiblity with multicompany module
+Fix: Edit propal line was losing product supplier price id
+Fix: Delete linked element to supplier invoice when deleted 
 
 ***** ChangeLog for 3.4 compared to 3.3.* *****
 For users:
@@ -78,6 +80,7 @@ For users:
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
 - Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
+- Fix: Expedition creation, can retreive product from other expedition
 
 For translators:
 - Update language files.
diff --git a/build/debian/changelog b/build/debian/changelog
index 17a361e4ae0..11706ff7ff3 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,9 +1,6 @@
-dolibarr (3.4.0+nmu1) unstable; urgency=low
+dolibarr (3.4.1) unstable; urgency=low
 
-  * Non-maintainer upload.
+  [ Laurent Destailleur (eldy) ]
   * New upstream release.
-    closes: bug#634783
     
- -- Dolibarr team <contact@dolibarr.org>  Mon, 22 Apr 2013 12:00:00 +0100     
-
-# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
diff --git a/build/debian/control b/build/debian/control
index 3fb705087a8..430cdb5f347 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -1,5 +1,6 @@
 Source: dolibarr
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
 Standards-Version: 3.9.2
 Section: web
 Priority: optional
diff --git a/build/debian/get-orig-source.sh b/build/debian/get-orig-source.sh
new file mode 100755
index 00000000000..e3d201d672f
--- /dev/null
+++ b/build/debian/get-orig-source.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# run with
+# debian/get-orig-source.sh [x.y.z]
+
+tmpdir=$(mktemp -d)
+echo "tmpdir = $tmpdir"
+
+if [ -n "$1" ]; then
+    uscan_opts="--download-version=$1"
+fi
+uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+
+cd $tmpdir
+
+tgzfile=$(echo *.tar.gz)
+version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr_//; s/\.zip$//; s/_/./g; s/\+nmu1//; s/$/+dfsg/;')
+
+# Extract the zip file
+tar -xvf $tgzfile
+srcdir=$(find . -maxdepth 1 -mindepth 1 -type d | sed -e 's/\.\///')
+
+if [ ! -d "$srcdir" ]; then
+    echo "ERROR: Failed to identify the extracted directory in $tmpdir (got $srcdir)" >&2
+    rm -rf $tmpdir
+    exit 1
+fi
+
+# Repack as tar.xz
+tar Jcf dolibarr_${version}.orig.tar.xz $srcdir
+
+cd - >/dev/null
+
+if [ -e ../dolibarr_${version}.orig.tar.xz ]; then
+    echo "Not overwriting ../dolibarr_${version}.orig.tar.xz";
+else
+    echo "Created ../dolibarr_${version}.orig.tar.xz"
+    mv $tmpdir/dolibarr_${version}.orig.tar.xz ../
+fi
+
+#rm -rf $tmpdir
diff --git a/build/debian/wash b/build/debian/wash
deleted file mode 100644
index 7d3ec07d7a5..00000000000
--- a/build/debian/wash
+++ /dev/null
@@ -1,3 +0,0 @@
-# watch control file for uscan
-#version=3
-#http://http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate
diff --git a/build/debian/watch b/build/debian/watch
new file mode 100644
index 00000000000..0f84815a48e
--- /dev/null
+++ b/build/debian/watch
@@ -0,0 +1,4 @@
+# watch control file for uscan
+version=3
+#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
+http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.tar\.gz
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 67a2c9b2caa..880602b2336 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 3.4.0
+PROJECT_NUMBER = 3.4.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -611,7 +611,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes 
+EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 7510ff88152..486dcdafc23 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.0
+AppVerName=DoliWamp-3.4.1
 ; 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.0
+OutputBaseFilename=DoliWamp-3.4.1
 ; 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 dd348af17a6..840b6448e56 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -10,7 +10,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="4";
-$BUILD="0";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="1";		# 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
@@ -549,7 +549,7 @@ if ($nboftargetok) {
             $build = $newbuild;
             $build =~ s/-.*$//g;
 			# now build is 0 for example
-			$build .= '+nmu1';
+			# $build .= '+nmu1';
 			# now build is 0+nmu1 for example
 			
     		print "Remove target ${FILENAMEDEB}_all.deb...\n";
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 5015b6dee0b..c0884a5cd13 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
+return ( "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }
 
 sub script_dolibarr_category
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index ef7216d1bc3..60756c8beb6 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.0-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 7f5bda2c2b9..39fac2f53bf 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -554,5 +554,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.0-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index c6a78e9311a..6a9e1dd47d7 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.0-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 43b9e8c2d70..180e9355b00 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -341,5 +341,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.0-0.3
+* Sun Feb 17 2013 Laurent Destailleur 3.4.1-0.3
 - Initial version (#723326)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index db8dd255b6c..b6964b1981d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2924,7 +2924,7 @@ class PropaleLigne
         if (empty($this->info_bits)) $this->info_bits=0;
         if (empty($this->special_code)) $this->special_code=0;
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_parent_line)) $this->fk_fournprice=0;
+        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 888dd6c5eb0..90b1b89d1a5 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -224,6 +224,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
 		$sql.= ")";
 
+		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -323,6 +324,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".$qty;
 		$sql.= ")";
 
+		dol_syslog(get_class($this)."::create_line sql=".$sql, LOG_DEBUG);
 		if (! $this->db->query($sql))
 		{
 			$error++;
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index d761480a74f..a5ec2e016c6 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -87,6 +87,8 @@ if ($id > 0 || ! empty($ref))
 if ($action == 'add')
 {
     $error=0;
+    
+    $object = new Expedition($db);
 
     $db->begin();
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 5462c1fda7f..dfaa4f78571 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.0');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.4.1');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 19912e3f58f..be2ce721356 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -629,6 +629,13 @@ class FactureFournisseur extends CommonInvoice
         	// Fin appel triggers
         }
 
+        if (! $error)
+        {
+        	// Delete linked object
+        	$res = $this->deleteObjectLinked();
+        	if ($res < 0) $error++;
+        }
+
         if (! $error)
         {
         	// We remove directory
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 540cbebea12..b15695aa653 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -168,6 +168,8 @@ if (GETPOST("search_montant_ttc"))
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 
+
+dol_syslog("fourn/facture/index.php::list sql=".$sql, LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {