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

Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_20652

Browse Source
This commit is contained in:
Florian HENRY 2022-04-27 08:52:31 +02:00
commit 8fab7bbf55
7 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/install/mysql/migration/15.0.0-16.0.0.sql
View File

@ -97,6 +97,12 @@ ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_soc (fk_type, fk_soc,
ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_member (fk_type, fk_member, date_partnership_start);
-- Add column to help to fix a very critical bug when transferring into accounting bank record of a bank account into another currency.
-- Idea is to update this column manually in v15 with value in currency of company for bank that are not into the main currency and the transfer
-- into accounting will use it in priority if value is not null. The script repair.sql contains the sequence to fix datas in llx_bank.
ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
-- v16
UPDATE llx_cronjob set label = 'RecurringInvoicesJob' where label = 'RecurringInvoices';

8
htdocs/main.inc.php
View File

@ -2348,9 +2348,7 @@ function top_menu_quickadd()
$html .= '<!-- div for quick add link -->
<div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
<a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')">
<i class="fa fa-plus-circle" ></i>
</a>
<a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')"><i class="fa fa-plus-circle"></i></a>
<div class="dropdown-menu">'.printDropdownQuickadd().'</div>
</div>';
$html .= '
@ -2559,9 +2557,7 @@ function top_menu_bookmark()
} else {
$html .= '<!-- div for bookmark link -->
<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">
<a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">
<i class="fa fa-star" ></i>
</a>
<a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')"><i class="fa fa-star"></i></a>
<div class="dropdown-menu">
'.printDropdownBookmarksList().'
</div>

6
htdocs/societe/list.php
View File

@ -249,7 +249,7 @@ $arrayfields = array(
's.idprof6'=>array('label'=>"ProfId6Short", 'position'=>45, 'checked'=>$checkedprofid6),
's.tva_intra'=>array('label'=>"VATIntraShort", 'position'=>50, 'checked'=>0),
'customerorsupplier'=>array('label'=>'NatureOfThirdParty', 'position'=>61, 'checked'=>1),
's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'position'=>62, 'checked'=>$checkprospectlevel),
's.fk_prospectlevel'=>array('label'=>"ProspectLevel", 'position'=>62, 'checked'=>$checkprospectlevel),
's.fk_stcomm'=>array('label'=>"StatusProsp", 'position'=>63, 'checked'=>$checkstcomm),
's2.nom'=>array('label'=>'ParentCompany', 'position'=>64, 'checked'=>0),
's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@ -876,7 +876,7 @@ if ($user->rights->societe->creer) {
$arrayofmassactions['predisable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToDisabled");
}
if ($user->rights->societe->creer) {
$arrayofmassactions['presetcommercial'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("AllocateCommercial");
$arrayofmassactions['presetcommercial'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("AllocateCommercial");
}
if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
$arrayofmassactions = array();
@ -1648,7 +1648,7 @@ while ($i < min($num, $limit)) {
$titlealt = $val['label'];
}
if ($obj->stcomm_id != $val['id']) {
print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.urlencode($val['code']).'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.urlencode($val['code']).'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
}
}
print '</div></div></td>';

16
htdocs/theme/eldy/dropdown.inc.php
View File

@ -96,8 +96,6 @@ button.dropdown-item.global-search-item {
box-shadow: 0 6px 12px rgba(0,0,0,.175);
}
.dropdown-menu {
border-color: #eee;
position: absolute;
top: 100%;
left: 0;
@ -112,7 +110,6 @@ button.dropdown-item.global-search-item {
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.15);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
@ -500,8 +497,19 @@ div.quickaddblock:focus {
right: 0;
}
#topmenu-quickadd-dropdown .dropdown-menu {
min-width: 220px;
max-width: 235px;
}
#topmenu-bookmark-dropdown .dropdown-menu {
min-width: 280px;
min-width: 220px;
max-width: 360px;
}
.dropdown-menu {
border: none;
-webkit-box-shadow: none;
box-shadow: none;
}
}

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

@ -78,6 +78,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
--colortexttitle: rgb(220,220,220);
--colortext: rgb(220,220,220);
--colortextlink: #4390dc;
--colortexttitlelink: #4390dc;
--colortextbackhmenu: rgb(220,220,220);
--colortextbackvmenu: rgb(220,220,220);
--tooltipfontcolor : rgb(220,220,220);
@ -5967,6 +5968,12 @@ span.select2.select2-container.select2-container--default {
border-right: none;
<?php } ?>
}
span.select2.select2-container.select2-container--default {
<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
//border-bottom: solid 1px var(--inputbordercolor);
<?php } ?>
}
input.select2-input {
border-bottom: none ! important;
}
@ -5985,7 +5992,7 @@ input.select2-input {
border: none;
}
.select2-container--focus span.select2-selection.select2-selection--single {
border-bottom: 1px solid #666 !important;
border-bottom: 1px solid var(--inputbordercolor) !important;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
@ -5996,14 +6003,14 @@ input.select2-input {
background-color: var(--colorbackvmenu1);
}
.select2-container--default .select2-selection--single {
background-color: var(--colorbackbody);
background-color: var(--inputbackgroundcolor);
}
#blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder {
color: var(--colortextbackvmenu);
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
color: var(--colortext);
/* background-color: var(--colorbackvmenu1); */
/* background-color: var(--inputbackgroundcolor); */
}
.select2-default {
color: #999 !important;

31
htdocs/theme/md/dropdown.inc.php
View File

@ -21,20 +21,26 @@ button.dropdown-item.global-search-item {
}
#topmenu-bookmark-dropdown a.login-dropdown-a {
#topmenu-quickadd-dropdown a.login-dropdown-a, #topmenu-bookmark-dropdown a.login-dropdown-a {
color: #fff;
}
div#topmenu-quickadd-dropdown {
position: fixed;
right: 65px;
top: 0px;
}
div#topmenu-bookmark-dropdown {
position: fixed;
right: 20px;
top: 0px;
}
#topmenu-login-dropdown .dropdown-toggle:after {
display: none;
}
#topmenu-bookmark-dropdown .dropdown-menu {
#topmenu-quickadd-dropdown .dropdown-menu, #topmenu-bookmark-dropdown .dropdown-menu {
min-width: 300px;
max-width: 360px;
}
@ -43,8 +49,8 @@ button.dropdown-item.global-search-item {
outline: none;
}
.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu{
display: block;
.open>.dropdown-search, .open>.dropdown-quickadd, .open>.dropdown-bookmark, .open>.dropdown-menu{
display: block !important;
}
.dropdown-search {
@ -194,7 +200,7 @@ button.dropdown-item.global-search-item {
max-width: 100%;
}
div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
line-height: 46px;
}
a.top-menu-dropdown-link {
@ -255,7 +261,8 @@ a.top-menu-dropdown-link {
max-height: calc(90vh - 110px) ;
white-space: normal;
}
#topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body{
#topmenu-quickadd-dropdown .dropdown-menu > .bookmark-body, #topmenu-quickadd-dropdown .dropdown-body,
#topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body {
max-height: 60vh ; /* fallback for browsers without support for calc() */
max-height: calc(90vh - 200px) ;
}
@ -277,7 +284,7 @@ a.top-menu-dropdown-link {
}
#topmenu-login-dropdown, #topmenu-bookmark-dropdown, #topmenu-global-search-dropdown {
#topmenu-login-dropdown, #topmenu-quickadd-dropdown, #topmenu-bookmark-dropdown, #topmenu-global-search-dropdown {
padding: 0 5px 0 5px;
}
#topmenu-login-dropdown a:hover{
@ -417,10 +424,18 @@ a.top-menu-dropdown-link {
/* smartphone */
@media only screen and (max-width: 767px)
{
#topmenu-quickadd-dropdown .dropdown-menu {
min-width: 220px;
max-width: 235px;
}
#topmenu-bookmark-dropdown .dropdown-menu {
min-width: 220px;
max-width: 360px;
}
#topmenu-bookmark-dropdown a.login-dropdown-a {
color: #000;
}
#topmenu-bookmark-dropdown .dropdown-menu {
width: 230px;
}

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

@ -2270,6 +2270,7 @@ div.nopadding {
}
td.nobordernopadding.widthpictotitle.col-picto {
color: #bbb;
opacity: 0.9;
}
.pictotitle {
@ -2279,6 +2280,9 @@ td.nobordernopadding.widthpictotitle.col-picto {
.pictoobjectwidth {
width: 14px;
}
span.widthpictotitle {
font-size: 1.3em;
}
.table-list-of-attached-files .col-picto, .table-list-of-links .col-picto {
opacity: 0.7 !important;
font-size: 1em;
@ -7349,10 +7353,7 @@ if (is_object($db)) {
background: #ddd;
}​
div#topmenu-bookmark-dropdown {
position: fixed;
right: 20px;
}
/* Must be at end */
div.flot-text .flot-tick-label .tickLabel, .fa-color-unset {