diff --git a/build/debian/rules b/build/debian/rules
index 6b75c68b85d..5a1cfdc8ecb 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -104,7 +104,6 @@ clean:
rm -fr htdocs/includes/jquery/plugins/flot
rm -fr htdocs/includes/jquery/plugins/jstree
rm -fr htdocs/includes/jquery/plugins/lightbox
- rm -fr htdocs/includes/jquery/plugins/mobile
rm -fr htdocs/includes/jquery/plugins/multiselect
rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 20462fa80d5..6c6a6d8d036 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -101,7 +101,7 @@ class box_actions extends ModeleBoxes
'logo' => ("action"),
'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id);
- $this->info_box_contents[$i][1] = array('td' => 'align="left" nowrap="1"',
+ $this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' => dol_trunc($label,32),
'text2'=> $late,
'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id);
diff --git a/htdocs/core/getmenu_jmobile.php b/htdocs/core/getmenu_jmobile.php
index 78c46c60fbb..988dec4339a 100644
--- a/htdocs/core/getmenu_jmobile.php
+++ b/htdocs/core/getmenu_jmobile.php
@@ -50,7 +50,7 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
* View
*/
-// URL http://mydolibarr/core/getmenu_jmobime?mainmenu=mainmenu&leftmenu=leftmenu can be used for tests
+// URL http://mydolibarr/core/getmenu_jmobile?mainmenu=mainmenu&leftmenu=leftmenu can be used for tests
$arrayofjs=array('/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js');
$arrayofcss=array('/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css');
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 656841297ad..33b694f5ed5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1581,7 +1581,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
* MAIN_DISABLE_TRUNC=1 can disable all truncings
*
* @param string $string String to truncate
- * @param int $size Max string size visible. 0 for no limit. finale string size can be 1 more (if size was max+1) or 3 more (if we added ...)
+ * @param int $size Max string size visible. 0 for no limit. Final string size can be 1 more (if size was max+1) or 3 more (if we added ...)
* @param string $trunc Where to trunc: right, left, middle (size must be a 2 power), wrap
* @param string $stringencoding Tell what is source string encoding
* @param int $nodot Truncation do not add ... after truncation. So it's an exact truncation.
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 93fc2dd3963..985121a4de8 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -41,7 +41,7 @@ class FactureFournisseur extends CommonInvoice
public $fk_element='fk_facture_fourn';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $ref;
+ var $ref;
var $product_ref;
var $ref_supplier;
var $socid;
@@ -298,7 +298,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ' s.nom as socnom, s.rowid as socid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t,'.MAIN_DB_PREFIX.'societe as s';
if ($id) $sql.= " WHERE t.rowid=".$id;
- if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
+ if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
$sql.= ' AND t.fk_soc = s.rowid';
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
@@ -310,9 +310,9 @@ class FactureFournisseur extends CommonInvoice
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
- $this->ref = $obj->ref;
+ $this->ref = $obj->ref?$obj->ref:$obj->rowid; // We take rowid if ref is empty for backward compatibility
- $this->ref_supplier = $obj->ref_supplier;
+ $this->ref_supplier = $obj->ref_supplier;
$this->entity = $obj->entity;
$this->type = empty($obj->type)?0:$obj->type;
$this->fk_soc = $obj->fk_soc;
@@ -663,7 +663,7 @@ class FactureFournisseur extends CommonInvoice
return -$error;
}
}
-
+
/**
* Tag invoice as a payed invoice
@@ -1316,8 +1316,11 @@ class FactureFournisseur extends CommonInvoice
$label=$langs->trans("ShowInvoice").': '.$this->ref;
if ($this->ref_supplier) $label.=' / '.$this->ref_supplier;
+ $ref=$this->ref;
+ if (empty($ref)) $ref=$this->id;
+
if ($withpicto) $result.=($lien.img_object($label,'bill').$lienfin.' ');
- $result.=$lien.($max?dol_trunc($this->ref,$max):$this->ref).$lienfin;
+ $result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin;
return $result;
}
diff --git a/htdocs/index.php b/htdocs/index.php
index adb3c8e6f49..294443adff1 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -260,7 +260,7 @@ print ''.$langs->trans("Number").' ';
print ''.$langs->trans("Late").' ';
print ' ';
print ' ';
-if ($showweather) print ' ';
+if ($showweather) print ' ';
print '';
@@ -483,7 +483,7 @@ foreach($dashboardlines as $key => $board)
print '';
if ($showweather)
{
- print '';
+ print ' ';
$text='';
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
$options='height="64px"';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c254f4a74db..bae7f0de7f2 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -647,9 +647,6 @@ if (! defined('NOLOGIN'))
$conf->css = "/theme/".$conf->theme."/style.css.php";
}
- // If theme support option like flip-hide left menu and we use a smartphone, we force it
- if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced';
-
// Set javascript option
if (! GETPOST('nojs')) // If javascript was not disabled on URL
{
@@ -949,6 +946,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{
print '
diff --git a/htdocs/theme/phones/smartphone/index.php b/htdocs/theme/phones/smartphone/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/phones/smartphone/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php
deleted file mode 100644
index d13d69e7c20..00000000000
--- a/htdocs/theme/phones/smartphone/theme/default/default.css.php
+++ /dev/null
@@ -1,531 +0,0 @@
-
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <?php echo $title; ?>
-
-
-
-
-
-
-
-
-
- showmenu(1); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- trans('SendNewPasswordDesc');
- }else{
- echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode);
- } ?>
-
-
-