lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into free_email

Browse Source
This commit is contained in:
Frédéric FRANCE 2020-05-12 18:02:52 +02:00
commit 39ae11efa3
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
9 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dolistore/ajax/image.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2017 Oscss-Shop <support@oscss-shop.fr>.
* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2020 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modifyion 2.0 (the "License");
* it under the terms of the GNU General Public License as published bypliance with the License.
@ -17,6 +18,9 @@
*/
if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1);
if (!defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', 1);
}
/**

7
htdocs/projet/class/project.class.php
View File

@ -1044,6 +1044,9 @@ class Project extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
if (! empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) {
$option = $conf->global->PROJECT_OPEN_ALWAYS_ON_TAB;
}
$label = '';
if ($option != 'nolink') $label = '<u>'.$langs->trans("Project").'</u>';
@ -1073,6 +1076,10 @@ class Project extends CommonObject
{
$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
}
elseif ($option == 'preview')
{
$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
}
else
{
$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;

2
htdocs/public/ticket/list.php
View File

@ -235,7 +235,7 @@ if ($action == "view_ticketlist")
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => $extrafields->attributes[$object->table_element]['list'][$key], 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => $extrafields->attributes[$object->table_element]['perms'][$key]);
$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' =>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3) && $extrafields->attributes[$object->table_element]['perms'][$key]);
}
}
}

3
htdocs/takepos/css/pos.css.php
View File

@ -591,6 +591,9 @@ div#moreinfo, div#infowarehouse {
height: calc(45% - 100px);
}
div#moreinfo, div#infowarehouse {
padding: 0 5px 0 5px;
}
div.div1 {
padding-bottom: 0;

9
htdocs/takepos/index.php
View File

@ -756,8 +756,13 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
<div class="header">
<div class="topnav">
<div class="topnav-left">
<div class="inline-block valignmiddle"><a class="topnav-terminalhour" onclick="TerminalsDialog();">
<?php echo $langs->trans("Terminal")." ";
<div class="inline-block valignmiddle">
<a class="topnav-terminalhour" onclick="TerminalsDialog();">
<span class="fa fa-cash-register"></span>
<span class="hideonsmartphone">
<?php echo $langs->trans("Terminal"); ?>
</span>
<?php echo " ";
if ($_SESSION["takeposterminal"] == "") echo "1";
else echo $_SESSION["takeposterminal"];
echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';

2
htdocs/takepos/invoice.php
View File

@ -747,7 +747,7 @@ $( document ).ready(function() {
$("#customerandsales").html('');
$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth75" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
<?php
$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";

1
htdocs/theme/eldy/global.inc.php
View File

@ -1026,6 +1026,7 @@ table[summary="list_of_modules"] .fa-cog {
.clearboth { clear:both; }
.hideobject { display: none; }
.minwidth50 { min-width: 50px; }
.minwidth75 { min-width: 75px; }
/* rule for not too small screen only */
@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
{

2
htdocs/theme/eldy/main_menu_fa_icons.inc.php
View File

@ -8,7 +8,7 @@
font-style: normal;
font-variant: normal;
text-rendering: auto;
line-height: 26px;
line-height: 23px;
font-size: <?php echo $topMenuFontSize; ?>;
-webkit-font-smoothing: antialiased;
text-align:center;

1
htdocs/theme/md/style.css.php
View File

@ -1119,6 +1119,7 @@ table[summary="list_of_modules"] .fa-cog {
.clearboth { clear:both; }
.hideobject { display: none; }
.minwidth50 { min-width: 50px; }
.minwidth75 { min-width: 75px; }
/* rule for not too small screen only */
@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
{