diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql index 7da728a723a..39560240475 100644 --- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql +++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql @@ -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'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 59a43daac65..805d7b9e105 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2348,9 +2348,7 @@ function top_menu_quickadd() $html .= ' '; $html .= ' @@ -2559,9 +2557,7 @@ function top_menu_bookmark() } else { $html .= ' '; diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 2bb2f61375b..6bd8ede6331 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -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; + } + } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 9a940d9e1a9..356c8f45d63 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -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; } +span.select2.select2-container.select2-container--default { + global->THEME_SHOW_BORDER_ON_INPUT)) { ?> + //border-bottom: solid 1px var(--inputbordercolor); + +} + 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; diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php index a6bffa753f5..25cbbb28ea9 100644 --- a/htdocs/theme/md/dropdown.inc.php +++ b/htdocs/theme/md/dropdown.inc.php @@ -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; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 5ebeb73261e..f1a07efbb0c 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -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 {