diff --git a/templates/web/common/drop_down_options.html b/templates/web/common/drop_down_options.html
index d07ca3b41a..ca7ca86aec 100644
--- a/templates/web/common/drop_down_options.html
+++ b/templates/web/common/drop_down_options.html
@@ -10,7 +10,7 @@
               {% if user.ACL.has_right_on_base(record.get_base_id, 'canputinalbum') and not record.is_grouping() %}
               <div title="" class="context-menu-item">
                 <div class="context-menu-item-inner"
-                     onclick="evt_add_in_chutier('{{record.get_base_id}}','{{record.get_record_id}}',false,true);return(false);">
+                     onclick="evt_add_in_chutier('{{record.get_sbas_id}}','{{record.get_record_id}}',false,this);return(false);">
                   {% trans 'action : ajouter au panier' %}
                 </div>
               </div>
@@ -42,4 +42,4 @@
         </tr>
       </tbody>
     </table>
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/templates/web/prod/preview/tools.html b/templates/web/prod/preview/tools.html
index e9888ad449..ad246db4ef 100644
--- a/templates/web/prod/preview/tools.html
+++ b/templates/web/prod/preview/tools.html
@@ -1,14 +1,14 @@
 
 {% if (record.is_from_basket is empty) and user.ACL().has_right_on_base(record.get_base_id(), 'canputinalbum') %}
   <div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}"
-       class="baskAdder" title="{% trans 'action : ajouter au panier' %}" 
-       onclick="evt_add_in_chutier('{{record.get_base_id()}}','{{record.get_record_id()}}',false);return(false);"></div>
+       class="baskAdder" title="{% trans 'action : ajouter au panier' %}"
+       onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
 {% endif %}
 
-  <div class="printer" title="'{% trans 'action : print' %}" 
+  <div class="printer" title="'{% trans 'action : print' %}"
        onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 
 {% if user.ACL().has_right_on_base(record.get_base_id(), 'candwnldhd') or user.ACL().has_right_on_base(record.get_base_id(), 'candwnldpreview') %}
-    <div class="downloader" title="{% trans 'action : exporter' %}" 
+    <div class="downloader" title="{% trans 'action : exporter' %}"
     onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 {% endif %}
diff --git a/www/client/answer.php b/www/client/answer.php
index 46698f71f2..273fbb587b 100644
--- a/www/client/answer.php
+++ b/www/client/answer.php
@@ -155,13 +155,13 @@ $ACL = $user->ACL();
 if ($registry->get('GV_thesaurus'))
 {
   ?>
-  <script language="javascr<?php ?>ipt">
-    document.getElementById('proposals').innerHTML = "<div style='height:0px; overflow:hidden'>\n<?php echo p4string::MakeString($qp['main']->proposals["QRY"], "JS") ?>\n</div>\n<?php echo p4string::MakeString(proposalsToHTML($qp['main']->proposals), "JS") ?>";
+  <script language="javascript">
+    document.getElementById('proposals').innerHTML = "<div style='height:0px; overflow:hidden'>\n<?php echo p4string::MakeString($parm['qry'], "JS") ?>\n</div>\n<?php echo p4string::MakeString($proposals, "JS") ?>";
   <?php
   if ($registry->get('GV_clientAutoShowProposals'))
   {
     ?>
-        if("<?php echo p4string::MakeString(proposalsToHTML($qp['main']->proposals), "JS") ?>" != "<div class=\"proposals\"></div>")
+        if("<?php echo p4string::MakeString($proposals, "JS") ?>" != "<div class=\"proposals\"></div>")
         chgOng(4);
     <?php
   }
@@ -432,11 +432,11 @@ if (count($result->get_datas()) > 0)
                 <?php
                 if ($ACL->has_right_on_base($record->get_base_id(), "canputinalbum"))
                 {
-                  ?><div class="baskAdder" title="<?php echo _('action : ajouter au panier') ?>" onClick="evt_add_in_chutier('<?php echo $record->get_base_id() ?>', '<?php echo $record->get_record_id() ?>');"></div><?php
-          }
-          if ($mod_col != '1')
-          {
-                  ?>
+            ?><div class="baskAdder" title="<?php echo _('action : ajouter au panier') ?>" onClick="evt_add_in_chutier('<?php echo $record->get_sbas_id() ?>', '<?php echo $record->get_record_id() ?>');"></div><?php
+                }
+                if ($mod_col != '1')
+                {
+            ?>
                   <div style="margin-right:3px;" class="infoTips" id="INFO<?php echo $record->get_base_id() ?>_<?php echo $record->get_record_id() ?>" tooltipsrc="/prod/tooltip/tc_datas/<?php echo $record->get_sbas_id() ?>/<?php echo $record->get_record_id() ?>/"></div>
                   <?php
                   try
@@ -487,30 +487,30 @@ if (count($result->get_datas()) > 0)
   phrasea::getHome('HELP', 'client');
 }
 
-function proposalsToHTML(&$proposals)
-{
-
-  $html = '<div class="proposals">';
-  $b    = true;
-  foreach ($proposals["BASES"] as $zbase)
-  {
-    if ((int) (count($proposals["BASES"]) > 1) && count($zbase["TERMS"]) > 0)
-    {
-      $style = $b ? 'style="margin-top:0px;"' : '';
-      $b     = false;
-      $html .= "<h1 $style>" . sprintf(_('reponses::propositions pour la base %s'), htmlentities($zbase["NAME"])) . "</h1>";
-    }
-    $t     = true;
-    foreach ($zbase["TERMS"] as $path => $props)
-    {
-      $style = $t ? 'style="margin-top:0px;"' : '';
-      $t     = false;
-      $html .= "<h2 $style>" . sprintf(_('reponses::propositions pour le terme %s'), htmlentities($props["TERM"])) . "</h2>";
-      $html .= $props["HTML"];
-    }
-  }
-  $html .= '</div>';
-
-  return($html);
-}
+//function proposalsToHTML(&$proposals)
+//{
+//
+//  $html = '<div class="proposals">';
+//  $b    = true;
+//  foreach ($proposals["BASES"] as $zbase)
+//  {
+//    if ((int) (count($proposals["BASES"]) > 1) && count($zbase["TERMS"]) > 0)
+//    {
+//      $style = $b ? 'style="margin-top:0px;"' : '';
+//      $b     = false;
+//      $html .= "<h1 $style>" . sprintf(_('reponses::propositions pour la base %s'), htmlentities($zbase["NAME"])) . "</h1>";
+//    }
+//    $t     = true;
+//    foreach ($zbase["TERMS"] as $path => $props)
+//    {
+//      $style = $t ? 'style="margin-top:0px;"' : '';
+//      $t     = false;
+//      $html .= "<h2 $style>" . sprintf(_('reponses::propositions pour le terme %s'), htmlentities($props["TERM"])) . "</h2>";
+//      $html .= $props["HTML"];
+//    }
+//  }
+//  $html .= '</div>';
+//
+//  return($html);
+//}
 
diff --git a/www/client/baskets.php b/www/client/baskets.php
index 9a4cd0cf81..655bdd71fd 100644
--- a/www/client/baskets.php
+++ b/www/client/baskets.php
@@ -43,7 +43,7 @@ if ($Request->get('act') == "ADDIMG" && ($Request->get("p0") != "" && $Request->
   /* @var $repository \Repositories\BasketRepository */
   $basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
 
-  $sbas_id = phrasea::sbasFromBas($Request->get('bas'));
+  $sbas_id = $Request->get('sbas');
   $record = new record_adapter($sbas_id, $Request->get('p0'));
 
   $BasketElement = new \Entities\BasketElement();
diff --git a/www/client/index.php b/www/client/index.php
index 4045b09716..9ea80f190c 100644
--- a/www/client/index.php
+++ b/www/client/index.php
@@ -576,56 +576,51 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
     <!-- BOITE MODALE DIALOG -->
     <div id="MESSAGE"></div>
 
-    <?php
-    echo databox_cgu::askAgreement();
-    ?>
-    <div id="OVERLAY2" style="display:none;">
-
-    </div>
-    <iframe id="MODALDL" class="modalbox" src="" name="download" frameborder="0">
-    </iframe>
-  <!--<iframe style="display:none;" id="download" name="download"></iframe>-->
-    <form style="display:none;" action="./index.php" target="_self" id="mainForm">
-    </form>
-    <div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index:12000;"></div>
-    <form name="formChu" id="formChu" action="./baskets.php" method="post" style="visibility:hidden; display:none" >
-      <input type="hidden" name="bas" id="formChubas" value="">
-      <input type="hidden" name="act" id="formChuact" value="">
-      <input type="hidden" name="p0"  id="formChup0" value="">
-      <input type="hidden" name="ssel_id" value="">
-      <input type="hidden" name="courChuId" id="formChuBaskId" value="">
-    </form>
-    <form name="formPrintPage" action="printpage.php" method="post" style="visibility:hidden; display:none" >
-      <input type="hidden" name="lst" value="">
-    </form>
-    <form name="validatorEject" target="wVal" id="validatorEject" action="/lightbox/index.php" method="post" style="visibility:hidden; display:none" >
-      <input type="hidden" name="ssel_id" id="ssel2val" value="">
-      <input type="hidden" name="mode" value="0">
-    </form>
-    <form name="logout" target="_self" id="logout" action="/login/logout.php" method="post" style="visibility:hidden; display:none" >
-      <input type="hidden" name="app" value="client">
-    </form>
-    <script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
-    <script type="text/javascript" src="/include/minify/g=client"></script>
-    <script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.6.min.js"></script>
-    <script type="text/javascript">
+                        </div>
+                        <iframe id="MODALDL" class="modalbox" src="" name="download" frameborder="0">
+                        </iframe>
+                      <!--<iframe style="display:none;" id="download" name="download"></iframe>-->
+                        <form style="display:none;" action="./index.php" target="_self" id="mainForm">
+                        </form>
+                        <div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index12000;"></div>
+                        <form name="formChu" id="formChu" action="./baskets.php" method="post" style="visibility:hidden; display:none" >
+                          <input type="hidden" name="sbas" id="formChubas" value="">
+                          <input type="hidden" name="act" id="formChuact" value="">
+                          <input type="hidden" name="p0"  id="formChup0" value="">
+                          <input type="hidden" name="ssel_id" value="">
+                          <input type="hidden" name="courChuId" id="formChuBaskId" value="">
+                        </form>
+                        <form name="formPrintPage" action="printpage.php" method="post" style="visibility:hidden; display:none" >
+                          <input type="hidden" name="lst" value="">
+                        </form>
+                        <form name="validatorEject" target="wVal" id="validatorEject" action="/lightbox/index.php" method="post" style="visibility:hidden; display:none" >
+                          <input type="hidden" name="ssel_id" id="ssel2val" value="">
+                          <input type="hidden" name="mode" value="0">
+                        </form>
+                        <form name="logout" target="_self" id="logout" action="/login/logout.php" method="post" style="visibility:hidden; display:none" >
+                          <input type="hidden" name="app" value="client">
+                        </form>
+                        <script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
+                        <script type="text/javascript" src="/include/minify/g=client"></script>
+                        <script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.6.min.js"></script>
+                        <script type="text/javascript">
 
 
-      function reModCol()
-      {
-        var mod_col = $('#mod')[0].options[$('#mod')[0].selectedIndex].value.split('X');
-        if(mod_col[0])
-          mod_col = mod_col[1]
-        var w = Math.round((bodyW - 16) / (mod_col==1?4:mod_col)) - 12;
+                          function reModCol()
+                          {
+                            var mod_col = $('#mod')[0].options[$('#mod')[0].selectedIndex].value.split('X');
+                            if(mod_col[0])
+                              mod_col = mod_col[1]
+                            var w = Math.round((bodyW - 16) / (mod_col==1?4:mod_col)) - 12;
 
-        if(w < 128)
-          w = 128;
-        var propname = document.styleSheets[0].cssRules ? "cssRules":"rules";  // firefox=cssRules ; safari,ie=rules
-        document.styleSheets[0][propname][0].style.width  = (w-20)+"px";  // IMG.hthbimg
-        document.styleSheets[0][propname][1].style.height = (w-20)+"px";  // IMG.vthbimg
-        document.styleSheets[0][propname][2].style.width  = (w)+"px";  // .w160px
-        document.styleSheets[0][propname][3].style.height = (w)+"px";  // .h160px
-      }
+                            if(w < 128)
+                              w = 128;
+                            var propname = document.styleSheets[0].cssRules ? "cssRules":"rules";  // firefox=cssRules ; safari,ie=rules
+                            document.styleSheets[0][propname][0].style.width  = (w-20)+"px";  // IMG.hthbimg
+                            document.styleSheets[0][propname][1].style.height = (w-20)+"px";  // IMG.vthbimg
+                            document.styleSheets[0][propname][2].style.width  = (w)+"px";  // .w160px
+                            document.styleSheets[0][propname][3].style.height = (w)+"px";  // .h160px
+                          }
 
 
 
diff --git a/www/client/jquery.p4client.1.0.js b/www/client/jquery.p4client.1.0.js
index a03d4341ce..80cf90b93d 100644
--- a/www/client/jquery.p4client.1.0.js
+++ b/www/client/jquery.p4client.1.0.js
@@ -30,22 +30,23 @@ function acceptCgus(name,value)
 
 function cancelCgus(id)
 {
-  $.ajax({
-    type: "POST",
-    url: "/prod/TOU/deny/" + id + "/",
-    dataType:'json',
-    success: function(data){
-      if(data.success)
-      {
-        alert(language.cgusRelog);
-        self.location.replace(self.location.href);
-      }
-      alert
-      {
-        humane.error(data.message);
-      }
-    }
-  });
+
+	$.ajax({
+		type: "POST",
+		url: "/prod/prodFeedBack.php",
+		data: {
+			sbas_id:id,
+			action:'DENY_CGU'
+		},
+		success: function(data){
+			if(data == '1')
+			{
+				alert(language.cgusRelog);
+				self.location.replace(self.location.href);
+			}
+		}
+	});
+
 }
 
 function activateCgus()
@@ -631,8 +632,8 @@ function clktri(id){
  * CHUTIER
  **************/
 
-function evt_add_in_chutier(base_id, record_id){
-	$('#formChubas')[0].value = base_id;
+function evt_add_in_chutier(sbas_id, record_id){
+	$('#formChubas')[0].value = sbas_id;
 	$('#formChuact')[0].value = "ADDIMG";
 	$('#formChup0')[0].value = record_id;
 	$('#formChu').submit();
@@ -780,6 +781,8 @@ function evt_dwnl(lst)
 {
 	var dialog_box = $('#dialog_dwnl');
 
+	dialog_box = $('#dialog_dwnl');
+
 	dialog_box.empty().addClass('loading').dialog({
 		width:800,
 		height:600,
@@ -817,36 +820,6 @@ function evt_dwnl(lst)
 
 }
 
-
-//function evt_dwnl(lst){
-//	var top;
-//	var left;
-//
-//	var url = "" +
-//	"/include/multiexports.php" +
-//	"?" +
-//	"&callclient=1";
-//
-//
-//	$('#MODALDL').attr('src',url);
-//
-//
-//	var t = (bodySize.y - 400) / 2;
-//	var l = (bodySize.x - 550) / 2;
-//
-//	$('#MODALDL').css({
-//		'display': 'block',
-//		'opacity': 0,
-//		'width': '550px',
-//		'position': 'absolute',
-//		'top': t,
-//		'left': l,
-//		'height': '400px'
-//	}).fadeTo(500, 1);
-//
-//	showOverlay(2);
-//}
-
 function profil(value)
 {
 	var top;