Fix linkof mass action for pdf merge

htdocs/comm/propal/list.php

@@ -289,7 +289,7 @@ if ($sall) {
 }
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
-if ($viewstatut <> '')
+if ($viewstatut != '' && $viewstatut != '-1')
 {
 	$sql.= ' AND p.fk_statut IN ('.$viewstatut.')';
 }

htdocs/core/class/html.form.class.php

@@ -562,10 +562,17 @@ class Form
         		jQuery(".checkforselect").click(function() {
         			initCheckForSelect();
     	  		});
-        	    /* Warning: if you set submit button to disabled, post using Enter will no more work
     	  		jQuery(".massactionselect").change(function() {
-    	  			console.log( $( this ).val() );
+        			var massaction = $( this ).val();  
-    	  			if ($(this).val() != \'0\')
+        			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
+        			if (massaction == "builddoc") 
+                    {
+                        urlform = urlform + "#show_files";
+    	            }
+        			$( this ).closest("form").attr("action", urlform);
+                    console.log("we select a mass action "+massaction+" - "+urlform);
+        	        /* Warning: if you set submit button to disabled, post using Enter will no more work
+        			if ($(this).val() != \'0\')
     	  			{
     	  				jQuery(".massactionconfirmed").prop(\'disabled\', false);
     	  			}
@@ -573,8 +580,8 @@ class Form
     	  			{
     	  				jQuery(".massactionconfirmed").prop(\'disabled\', true);
     	  			}
-    	  		});
+        	        */
-        	    */
+    	        });
         	});
     		</script>
         	';