';
@@ -1049,7 +1049,7 @@ if ($id > 0)
// Location
if (empty($conf->global->AGENDA_DISABLE_LOCATION))
{
- print '
'.$langs->trans("Location").'
';
+ print '
'.$langs->trans("Location").'
';
}
// Assigned to
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 0d9a9a94aea..1f3ca1cde8e 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -55,7 +55,7 @@ if ($action == 'add_confirm')
if (! $label)
{
-
+ $error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Description")), null, 'errors');
}
if (! $amount)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0b629c1f215..9d30d93ad43 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1190,10 +1190,10 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
$nophoto='';
$morehtmlleft.='';
}
- elseif ($conf->browser->layout != 'phone') { // Show no photo link
+ //elseif ($conf->browser->layout != 'phone') { // Show no photo link
$nophoto='/public/theme/common/nophoto.png';
$morehtmlleft.='
';
- }
+ //}
}
}
else
@@ -1270,7 +1270,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
}
}
- if (! $phototoshow && $conf->browser->layout != 'phone') // Show No photo link (picto of pbject)
+ if (! $phototoshow) // Show No photo link (picto of pbject)
{
$morehtmlleft.='
';
if ($object->element == 'action')
@@ -1286,7 +1286,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
}
- $morehtmlleft.='
';
+ $morehtmlleft.='';
+ $morehtmlleft.='
';
+
$morehtmlleft.='
';
}
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 89b99a61041..8d34517686b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1075,10 +1075,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print ''."\n"; // Do not index
print ''; // Scale for mobile device
print ''."\n";
- // Favicon. Note, even if we remove this meta, the browser and android webview try to find a favicon.ico
+ // Favicon
$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
- print ''."\n";
+ if (empty($conf->dol_use_jmobile)) print ''."\n"; // Not required into an Android webview
//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print ''."\n";
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print ''."\n";
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print ''."\n";
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index ca3c0ba35e6..16f719a3a8f 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -307,9 +307,14 @@ if (count($tasksarray)>0)
$dateformatinput2="%m/%d/%Y"; // How the date for data are formated
//var_dump($dateformatinput);
//var_dump($dateformatinput2);
+
+ print '