Merge remote-tracking branch 'origin/3.8' into develop

Dolibarr · Aug 1, 2015 · 34b1ce6 · 34b1ce6
2 parents f9a7a49 + 3d847ac
commit 34b1ce6
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 53 deletions.
diff --git a/dev/ansible/README.md b/dev/ansible/README.md
diff --git a/dev/ansible/deployplaybook/deploydev.yml b/dev/ansible/deployplaybook/deploydev.yml
diff --git a/dev/ansible/deployplaybook/files/apachealias.conf b/dev/ansible/deployplaybook/files/apachealias.conf
diff --git a/dev/ansible/deployplaybook/hosts b/dev/ansible/deployplaybook/hosts
diff --git a/dev/ansible/deployplaybook/templates/info.html.j2 b/dev/ansible/deployplaybook/templates/info.html.j2
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2015       Juanjo Menent           <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,7 +69,7 @@
 $sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
-print $sql;
+
 $result = $db->query($sql);
 if ($result)
 {