diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 50e3b1e97be..8cfd5f202d5 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -50,9 +50,12 @@ function shipping_prepare_head($object)
 	{
 		// delivery link
 		$object->fetchObjectLinked($object->id,$object->element);
-		if (! empty($object->linkedObjectsIds['delivery'][0]))		// If there is a delivery
+		if (count($object->linkedObjectsIds['delivery']) >  0)		// If there is a delivery
 		{
-			$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->linkedObjectsIds['delivery'][0];
+		    // Take first one element of array 
+		    $tmp = reset($object->linkedObjectsIds['delivery']);
+		    
+			$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$tmp;
 			$head[$h][1] = $langs->trans("DeliveryCard");
 			$head[$h][2] = 'delivery';
 			$h++;
@@ -302,7 +305,8 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 					$expedition->id=$objp->sendingid;
 					$expedition->fetchObjectLinked($expedition->id,$expedition->element);
 					//var_dump($expedition->linkedObjects);
-					$receiving=(! empty($expedition->linkedObjects['delivery'][0])?$expedition->linkedObjects['delivery'][0]:'');
+					$receiving='';
+					if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']);   // Take first link
 
 					if (! empty($receiving))
 					{
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 2aa81102fa8..b2bc41220c3 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -77,7 +77,11 @@ class modMargin extends DolibarrModules
 		$this->langfiles = array("margins");
 
 		// Constants
-		$this->const = array();			// List of particular constants to add when module is enabled
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array(0=>array('MARGIN_TYPE','chaine','1','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
 
 		// New pages on tabs
 		$this->tabs = array(
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 2ab7a8aa54f..5d5b327deaf 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -51,7 +51,7 @@ class modOpenSurvey extends DolibarrModules
 
 		// Family can be 'crm','financial','hr','projects','product','technic','other'
 		// It is used to group modules in module setup page
-		$this->family = "projects";
+		$this->family = "portal";
 		$this->module_position = 40;
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3136e5a79b7..e565d015a93 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -338,7 +338,7 @@ if (empty($reshook))
 	    $result = $object->create_delivery($user);
 	    if ($result > 0)
 	    {
-	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?id='.$result);
+	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
 	        exit;
 	    }
 	    else
@@ -529,7 +529,7 @@ if ($action == 'create2')
     $action=''; $id=''; $ref='';
 }
 
-// Mode creation
+// Mode creation. TODO This part seems to not be used at all. Receipt record is created by the action "create_delivery" not from a form. 
 if ($action == 'create')
 {
     $expe = new Expedition($db);
@@ -1583,7 +1583,8 @@ else if ($id || $ref)
 		}
 
 		// This is just to generate a delivery receipt
-		if ($conf->livraison_bon->enabled && ($object->statut == 1 || $object->statut == 2) && $user->rights->expedition->livraison->creer && empty($object->linkedObjectsIds['delivery'][0]))
+		//var_dump($object->linkedObjectsIds['delivery']);
+		if ($conf->livraison_bon->enabled && ($object->statut == 1 || $object->statut == 2) && $user->rights->expedition->livraison->creer && count($object->linkedObjectsIds['delivery']) == 0)
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
 		}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 30607201e73..9ad2108519a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -789,9 +789,9 @@ class Expedition extends CommonObject
 
 
 	/**
-	 *	Cree un bon de livraison a partir de l'expedition
+	 *	Create a delivery receipt from a shipment
 	 *
-	 *	@param	User	$user       Utilisateur
+	 *	@param	User	$user       User
 	 *  @return int  				<0 if KO, >=0 if OK
 	 */
 	function create_delivery($user)
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 8b7066adc09..f18ed1ea80f 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -37,7 +37,7 @@ print load_fiche_titre($langs->trans('RelatedShippings'), '', '');
 	<td><?php echo $langs->trans("Ref"); ?></td>
 	<td align="center"><?php echo $langs->trans("Date"); ?></td>
 	<td align="center"><?php echo $langs->trans("DateDeliveryPlanned"); ?></td>
-	<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
+	<td align="right"><?php echo $langs->trans(""); ?></td>
 	<td align="right"><?php echo $langs->trans("Status"); ?></td>
 	<td></td>
 </tr>
@@ -53,10 +53,10 @@ foreach($linkedObjectBlock as $key => $objectlink)
 	<td align="center"><?php echo dol_print_date($objectlink->date_creation,'day'); ?></td>
 	<td align="center"><?php echo dol_print_date($objectlink->date_delivery,'day'); ?></td>
 	<td align="right"><?php
-		if ($user->rights->expedition->lire) {
+		/*if ($user->rights->expedition->lire) {
 			$total = $total + $objectlink->total_ht;
 			echo price($objectlink->total_ht);
-		} ?></td>
+		}*/ ?></td>
 	<td align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
 	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
 </tr>
@@ -64,15 +64,17 @@ foreach($linkedObjectBlock as $key => $objectlink)
 }
 
 ?>
+<!-- 
 <tr class="liste_total">
 	<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
 	<td align="right"><?php
-		if ($user->rights->expedition->lire) {
+		/*if ($user->rights->expedition->lire) {
 			echo price($total);
-		} ?></td>
+		}*/ ?></td>
 	<td></td>
 	<td></td>
 </tr>
 </table>
-
+ -->
+ 
 <!-- END PHP TEMPLATE -->
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 03b217f9a91..3e629e05789 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -57,8 +57,6 @@ llxHeader("",$langs->trans("Interventions"),$help_url);
 
 print load_fiche_titre($langs->trans("InterventionsArea"));
 
-//print '<table width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
@@ -204,14 +202,13 @@ if (! empty($conf->ficheinter->enabled))
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 $max=5;
 
 /*
- * Last modified orders
+ * Last modified interventions
  */
 
 $sql = "SELECT f.rowid, f.ref, f.fk_statut, f.date_valid as datec, f.tms as datem,";
@@ -281,16 +278,17 @@ else dol_print_error($db);
 
 
 /*
- * Orders to process
+ * interventions to process
  */
-if (! empty($conf->commande->enabled))
+/*
+if (! empty($conf->fichinter->enabled))
 {
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut, s.nom as name, s.rowid as socid";
 	$sql.=" FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE f.fk_soc = s.rowid";
-	$sql.= " AND f.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND f.entity IN (".getEntity('fichinter', 1).")";
 	$sql.= " AND f.fk_statut = 1";
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -303,7 +301,7 @@ if (! empty($conf->commande->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
+		print '<td colspan="3">'.$langs->trans("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
 
 		if ($num)
 		{
@@ -350,11 +348,10 @@ if (! empty($conf->commande->enabled))
 	}
 	else dol_print_error($db);
 }
+*/
 
 
 
-
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index 4eb1c792b65..eab3826a2c7 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -17,6 +17,9 @@ DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b
 DeliveryMethod=Delivery method
 TrackingNumber=Tracking number
 DeliveryNotValidated=Delivery not validated
+StatusDeliveryCanceled=Canceled
+StatusDeliveryDraft=Draft
+StatusDeliveryValidated=Received
 # merou PDF model						   
 NameAndSignature=Name and Signature : 
 ToAndDate=To___________________________________ on ____/_____/__________
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 802fb02e6ef..72044348151 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -82,7 +82,7 @@ OrdersOpened=Orders to process
 NoOpenedOrders=No open orders
 NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
-NoOrder=No Order
+NoOrder=No order
 NoSupplierOrder=No supplier order
 OtherOrders=Other orders
 LastOrders=Last %s customer orders
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 9ccae056b90..8a815c31edb 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -297,7 +297,7 @@ $formfile = new FormFile($db);
  * Mode creation
  *
  *********************************************************************/
-if ($action == 'create')
+if ($action == 'create')    // Seems to no be used
 {
 
 	print load_fiche_titre($langs->trans("CreateADeliveryOrder"));
@@ -538,8 +538,17 @@ else
 			$soc->fetch($object->socid);
 
 			$head=delivery_prepare_head($object);
-			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
 
+			
+			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="update_extras_line">';
+			print '<input type="hidden" name="origin" value="'.$origin.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
+				
+			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
+				
 			/*
 			 * Confirmation de la suppression
 			 *
@@ -565,13 +574,6 @@ else
 			 *   Livraison
 			 */
 			
-			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="update_extras_line">';
-			print '<input type="hidden" name="origin" value="'.$origin.'">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
-			
 			print '<table class="border" width="100%">';
 
 			// Shipment
@@ -590,7 +592,9 @@ else
 
 			// Ref
 			print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-			print '<td colspan="3">'.$object->ref.'</td></tr>';
+    		print '<td colspan="3">';
+    		print $object->ref;
+    		print '</td></tr>';
 
 			// Client
 			print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
@@ -818,15 +822,13 @@ else
 
 			print "</table>\n";
 			
-			if($object->statut == 0)	// only if draft
-				print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
-			
+            dol_fiche_end();
+
+			//if ($object->statut == 0)	// only if draft
+			//	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+            
 			print '</form>';
-				
-			
-
-			print "\n</div>\n";
-
+            
 
 			/*
 			 *    Boutons actions
@@ -899,6 +901,7 @@ else
 
 			print '</td></tr></table>';
 
+			// List of existing shipment and delivery receipts
 			if ($expedition->origin_id)
 			{
 				print '<br>';
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index faac4766337..14a83aca2f7 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -65,9 +65,9 @@ class Livraison extends CommonObject
 		$this->products = array();
 
 		// List of short language codes for status
-		$this->statuts[-1] = 'StatusSendingCanceled';
-		$this->statuts[0]  = 'StatusSendingDraft';
-		$this->statuts[1]  = 'StatusSendingValidated';
+		$this->statuts[-1] = 'StatusDeliveryCanceled';
+		$this->statuts[0]  = 'StatusDeliveryDraft';
+		$this->statuts[1]  = 'StatusDeliveryValidated';
 	}
 
 	/**
@@ -801,9 +801,9 @@ class Livraison extends CommonObject
 
 		if ($mode==0)
 		{
-			if ($statut==-1) return $langs->trans('StatusSendingCanceled');
-			if ($statut==0)  return $langs->trans('StatusSendingDraft');
-			if ($statut==1)  return $langs->trans('StatusSendingValidated');
+			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled');
+			if ($statut==0)  return $langs->trans('StatusDeliveryDraft');
+			if ($statut==1)  return $langs->trans('StatusDeliveryValidated');
 		}
 		if ($mode==1)
 		{
@@ -813,9 +813,9 @@ class Livraison extends CommonObject
 		}
 		if ($mode == 4)
 		{
-			if ($statut==-1) return img_picto($langs->trans('StatusSendingCanceled'),'statut5').' '.$langs->trans('StatusSendingCanceled');
-			if ($statut==0)  return img_picto($langs->trans('StatusSendingDraft'),'statut0').' '.$langs->trans('StatusSendingDraft');
-			if ($statut==1)  return img_picto($langs->trans('StatusSendingValidated'),'statut4').' '.$langs->trans('StatusSendingValidated');
+			if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
+			if ($statut==0)  return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
+			if ($statut==1)  return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
 		}
 	}