Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

ChangeLog

@@ -172,6 +172,8 @@ Dolibarr better:
 
 ***** ChangeLog for 3.6.3 compared to 3.6.2 *****
 - Fix: ref_ext was not saved when recording a customer order from web service
+- Fix: amarok is a bugged theme making dolidroid failed. We swith to eldy automatically with dolidroid.
+- Fix: withdrawal create error if in the same month are deleted previus withdrawals.
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.

htdocs/compta/prelevement/class/bonprelevement.class.php

 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014 		Ferran Marcet       <fmarcet@2byte.es>
  *
@@ -895,10 +895,11 @@ class BonPrelevement extends CommonObject
             {
                 $ref = "T".substr($year,-2).$month;
 
-                $sql = "SELECT count(*)";
+                $sql = "SELECT CAST(RIGHT(ref,2) AS SIGNED INTEGER)";
                 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
                 $sql.= " WHERE ref LIKE '".$ref."%'";
                 $sql.= " AND entity = ".$conf->entity;
+                $sql.= " ORDER BY ref DESC LIMIT 1";
 
                 dol_syslog(get_class($this)."::Create", LOG_DEBUG);
                 $resql = $this->db->query($sql);