diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 9d0c87cd424..30830cb26d4 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
@@ -120,8 +120,13 @@ if (function_exists('curl_init'))
     }
 }
 
+// Now show link to the changelog
 print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
-print '<a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/develop/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+
+$version=DOL_VERSION;
+if (preg_match('/[a-z]+/i', $version)) $version='develop';	// If version contains text, it is not an official tagged version, so we use the full change log.
+
+print '<a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
 print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index fffd5cc9d80..baa5ad4d771 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -179,6 +179,8 @@ class BlockedLog
 	 */
 	public function setObjectData(&$object)
 	{
+		global $mysoc;
+
 		// Set date
 		if ($object->element == 'payment' || $object->element == 'payment_supplier')
 		{
@@ -200,11 +202,25 @@ class BlockedLog
 
 		if ($this->element == 'facture')
 		{
-			if(empty($object->thirdparty))$object->fetch_thirdparty();
+			if (empty($object->thirdparty)) $object->fetch_thirdparty();
 			$this->object_data->thirdparty = new stdClass();
 
 			foreach($object->thirdparty as $key=>$value) {
-				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+				if (in_array($key, array('fields')) continue;	// Discard some properties
+				if (! in_array($key, array(
+					'name','name_alias','ref_ext','address','zip','town','state_code','country_code','idprof1','idprof2','idprof3','idprof4'',idprof5','idprof6','phone','fax','email','barcode',
+					'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
+					))) continue;								// Discard if not into a dedicated list
+				if (!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+			}
+
+			foreach($mysoc as $key=>$value) {
+				if (in_array($key, array('fields')) continue;	// Discard some properties
+				if (! in_array($key, array(
+				'name','name_alias','ref_ext','address','zip','town','state_code','country_code','idprof1','idprof2','idprof3','idprof4'',idprof5','idprof6','phone','fax','email','barcode',
+				'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
+				))) continue;									// Discard if not into a dedicated list
+				if (!is_object($value)) $this->object_data->mycompany->{$key} = $value;
 			}
 
 			$this->object_data->total_ht 	= (double) $object->total_ht;
@@ -212,6 +228,8 @@ class BlockedLog
 			$this->object_data->total_ttc	= (double) $object->total_ttc;
 			$this->object_data->total_localtax1= (double) $object->total_localtax1;
 			$this->object_data->total_localtax2= (double) $object->total_localtax2;
+			$this->object_data->total_localtax1= (double) $object->total_localtax1;
+			$this->object_data->total_localtax2= (double) $object->total_localtax2;
 			$this->object_data->note_public	= (double) $object->note_public;
 		}
 		if($this->element == 'invoice_supplier') {
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 348aeb4dcc8..fb1f99a5851 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsBlockedLog.class.php
+ *	\file       htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
  *  \ingroup    system
  *  \brief      Trigger file for blockedlog module
  */
@@ -24,6 +24,7 @@
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
+
 /**
  *  Class of triggered functions for agenda module
  */