From bd6d49f04a5ff374f4631950443518d51cbbed66 Mon Sep 17 00:00:00 2001
From: atm-arnaud <asp@atm-consulting.fr>
Date: Thu, 6 Feb 2020 12:08:50 +0100
Subject: [PATCH] FIX advanced target emailing sql and ergonomy

---
 htdocs/comm/mailing/class/advtargetemailing.class.php | 2 +-
 htdocs/core/tpl/advtarget.tpl.php                     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index ed04192d0e9..6eaddb799cf 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -141,7 +141,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$sql.= " ".(! isset($this->filtervalue)?'NULL':"'".$this->db->escape($this->filtervalue)."'").",";
 		$sql.= " ".$user->id.",";
 		$sql.= " '".$this->db->idate(dol_now())."',";
-		$sql.= " null";
+		$sql.= " ".$user->id;
 		$sql.= ")";
 
 		$this->db->begin();
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 2c351996632..b6c9033cad4 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -73,7 +73,10 @@ print '<script type="text/javascript" language="javascript">
 		print '<input type="button" name="loadfilter" id="loadfilter" value="' . $langs->trans('AdvTgtLoadFilter') . '" class="butAction"/>';
 		print '<input type="button" name="deletefilter" id="deletefilter" value="' . $langs->trans('AdvTgtDeleteFilter') . '" class="butAction"/>';
 		print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
-		print $langs->trans('AdvTgtOrCreateNewFilter');
+		print '</td><td>' . "\n";
+		print '</td></tr>' . "\n";
+		
+		print '<tr><td>' . $langs->trans('AdvTgtOrCreateNewFilter') . '</td><td>';
 		print '<input type="text" name="template_name" id="template_name" value=""/>';
 		print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
 		print '</td><td>' . "\n";