@@ -2535,8 +2535,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
if ($tzoutput == 'tzserver') {
$to_gmt = false;
$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
- $offsettz = 0; // Timezone offset with server timezone, so 0
- $offsetdst = 0; // Dst offset with server timezone, so 0
+ $offsettz = 0; // Timezone offset with server timezone (because to_gmt is false), so 0
+ $offsetdst = 0; // Dst offset with server timezone (because to_gmt is false), so 0
} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
$to_gmt = true;
$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -2546,8 +2546,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
$user_dt = new DateTime();
$user_dt->setTimezone($user_date_tz);
$user_dt->setTimestamp($tzoutput == 'tzuser' ? dol_now() : (int) $time);
- $offsettz = $user_dt->getOffset();
- } else { // old method (The 'tzuser' was processed like the 'tzuserrel')
+ $offsettz = $user_dt->getOffset(); // should include dst ?
+ } else { // with old method (The 'tzuser' was processed like the 'tzuserrel')
$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore
}
@@ -2628,6 +2628,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
$format = str_replace('%A', '__A__', $format);
}
+ $useadodb = getDolGlobalInt('MAIN_USE_LEGACY_ADODB_FOR_DATE', 0);
+ //$useadodb = 1; // To switch to adodb
// Analyze date
$reg = array();
@@ -2647,23 +2649,76 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
$ssec = (!empty($reg[6]) ? $reg[6] : '');
$time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
- $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
+ if (empty($useadodb)) {
+ if ($to_gmt) {
+ $tzo = new DateTimeZone('UTC'); // when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
+ } else {
+ $tzo = new DateTimeZone(date_default_timezone_get()); // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+ }
+ $dtts = new DateTime();
+ $dtts->setTimestamp($time);
+ $dtts->setTimezone($tzo);
+ $newformat = str_replace(
+ array('%Y', '%y', '%m', '%d', '%H', '%M', '%S', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+ array('Y', 'y', 'm', 'd', 'H', 'i', 's', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+ $format);
+ $ret = $dtts->format($newformat);
+ $ret = str_replace(
+ array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+ array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+ $ret);
+ } else {
+ $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
+ }
} else {
// Date is a timestamps
if ($time < 100000000000) { // Protection against bad date values
- $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+ $timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.
- $ret = adodb_strftime($format, $timetouse, $to_gmt); // If to_gmt = false then adodb_strftime use TZ of server
+ if (empty($useadodb)) {
+ if ($to_gmt) {
+ $tzo = new DateTimeZone('UTC'); // when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
+ } else {
+ $tzo = new DateTimeZone(date_default_timezone_get()); // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+ }
+ $dtts = new DateTime();
+ $dtts->setTimestamp($timetouse);
+ $dtts->setTimezone($tzo);
+ $newformat = str_replace(
+ array('%Y', '%y', '%m', '%d', '%H', '%M', '%S', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+ array('Y', 'y', 'm', 'd', 'H', 'i', 's', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+ $format);
+ $ret = $dtts->format($newformat);
+ $ret = str_replace(
+ array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+ array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+ $ret);
+ } else {
+ $ret = adodb_strftime($format, $timetouse, $to_gmt); // If to_gmt = false then adodb_strftime use TZ of server
+ }
+ //var_dump($ret);exit;
} else {
$ret = 'Bad value '.$time.' for date';
}
}
if (preg_match('/__b__/i', $format)) {
- $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+ $timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.
- // Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
- $month = adodb_strftime('%m', $timetouse, $to_gmt); // If to_gmt = false then adodb_strftime use TZ of server
+ if (empty($useadodb)) {
+ if ($to_gmt) {
+ $tzo = new DateTimeZone('UTC'); // when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
+ } else {
+ $tzo = new DateTimeZone(date_default_timezone_get()); // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+ }
+ $dtts = new DateTime();
+ $dtts->setTimestamp($timetouse);
+ $dtts->setTimezone($tzo);
+ $month = $dtts->format("m");
+ } else {
+ // After this ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
+ $month = adodb_strftime('%m', $timetouse, $to_gmt); // If to_gmt = false then adodb_strftime use TZ of server
+ }
$month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
if ($encodetooutput) {
$monthtext = $outputlangs->transnoentities('Month'.$month);
@@ -2682,8 +2737,21 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
//print "time=$time offsettz=$offsettz offsetdst=$offsetdst offsettzstring=$offsettzstring";
$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
- $w = adodb_strftime('%w', $timetouse, $to_gmt); // If to_gmt = false then adodb_strftime use TZ of server
+ if (empty($useadodb)) {
+ if ($to_gmt) {
+ $tzo = new DateTimeZone('UTC');
+ } else {
+ $tzo = new DateTimeZone(date_default_timezone_get());
+ }
+ $dtts = new DateTime();
+ $dtts->setTimestamp($timetouse);
+ $dtts->setTimezone($tzo);
+ $w = $dtts->format("w");
+ } else {
+ $w = adodb_strftime('%w', $timetouse, $to_gmt); // If to_gmt = false then adodb_strftime use TZ of server
+ }
$dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);
+
$ret = str_replace('__A__', $dayweek, $ret);
$ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);
}
@@ -2714,7 +2782,6 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
*/
function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
{
- //$datetimeobj = new DateTime('@'.$timestamp);
$datetimeobj = new DateTime();
$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone
if ($forcetimezone) {
@@ -3189,7 +3256,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
global $conf, $user, $langs, $mysoc, $hookmanager;
// Clean phone parameter
- $phone = preg_replace("/[\s.-]/", "", trim($phone));
+ $phone = is_null($phone) ? '' : preg_replace("/[\s.-]/", "", trim($phone));
if (empty($phone)) {
return '';
}
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 17021ab25db..0b836399f43 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -563,7 +563,7 @@ function dolSaveLicense($file, $content)
*/
function showWebsiteTemplates(Website $website)
{
- global $conf, $langs, $db, $form;
+ global $conf, $langs, $db, $form, $user;
$dirthemes = array('/doctemplates/websites');
if (!empty($conf->modules_parts['websitetemplates'])) { // Using this feature slow down application
@@ -582,11 +582,15 @@ function showWebsiteTemplates(Website $website)
// Title
print '| ';
print $form->textwithpicto($langs->trans("Templates"), $langs->trans("ThemeDir").' : '.join(", ", $dirthemes));
+ print ' ';
+ print '';
+ print img_picto('', 'refresh');
+ print '';
print ' | ';
print '';
$url = 'https://www.dolistore.com/43-web-site-templates';
print '';
- print $langs->trans('DownloadMoreSkins');
+ print img_picto('', 'globe', 'class="pictofixedwidth"').$langs->trans('DownloadMoreSkins');
print '';
print ' |
|---|
';
@@ -645,6 +649,9 @@ function showWebsiteTemplates(Website $website)
print $subdir;
print '
';
print ''.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).' - '.dol_print_date(dol_filemtime($templatedir), 'dayhour', 'tzuserrel').'';
+ if ($user->hasRight('website', 'delete')) {
+ print ' ref).'&templateuserfile='.urlencode($subdir).'">'.img_picto('', 'delete').'';
+ }
print '
ref).'&templateuserfile='.urlencode($subdir).'" class="button">'.$langs->trans("Load").'';
print '';
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index f5507e5e6c7..19f40bc984e 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -214,9 +214,9 @@ print '';
if (empty($action)) {
if ($user->rights->don->supprimer) {
if (!$disable_delete) {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', 1);
} else {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', 1);
}
}
}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 01a1cfb63a9..3f20188db56 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -283,11 +283,10 @@ if (empty($action) || $action == 'delete_section') {
// Actions buttons
print '
';
- if ($user->rights->ecm->setup) {
- print '
'.$langs->trans('Delete').'';
- } else {
- print '
'.$langs->trans('Delete').'';
- }
+
+ // Delete
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', $user->rights->ecm->setup);
+
print '
';
}
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index c36cebfc80c..42607aa0dab 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -464,21 +464,8 @@ if ($action != 'edit' && $action != 'delete' && $action != 'deletefile') {
print '
'.$langs->trans('ECMAddSection').'';
}
- //if (count($filearrayall) == 0)
- //{
- if ($permtoadd) {
- print '
'.$langs->trans('Delete').'';
- } else {
- print '
'.$langs->trans('Delete').'';
- }
- /*}
- else
- {
- if (count($filearray) > 0)
- print '
'.$langs->trans('Delete').'';
- else
- print '
'.$langs->trans('Delete').'';
- }*/
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().($module ? '&module='.urlencode($module) : '').'§ion='.urlencode($section).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), '', $permtoadd);
+
print '
';
+// Delete
if ($action == '') {
if ($user->rights->expensereport->supprimer) {
if (!$disable_delete) {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 1);
} else {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($title_button, $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 0);
}
}
}
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 6c07ec6837d..2f82b16e1ad 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -741,11 +741,9 @@ if ($action == 'create') {
print $langs->trans("AddIntervention").'
';
+
+ // Modify
print '
'.$langs->trans('Modify').'';
- print '
'.$langs->trans('Delete').'';
+
+ // Delete
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+
print '
'.$langs->trans("IfYouDontReconcileDisableProperty", $langs->transnoentitiesnoconv("Conciliable")).'';
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 71a80406ae4..10ba859e71f 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -185,4 +185,3 @@ AlreadyOneBankAccount=Already one bank account defined
SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA transfer: 'Payment Type' at 'Credit Transfer' level
SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
ToCreateRelatedRecordIntoBank=To create missing related bank record
-BanklineExtraFields=Bank Line Extrafields
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 4e4b2cfafe7..78378c6c5d3 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -23,6 +23,7 @@ Language_da_DK=Danish
Language_de_DE=German
Language_de_AT=German (Austria)
Language_de_CH=German (Switzerland)
+Language_de_LU=German (Luxembourg)
Language_el_GR=Greek
Language_el_CY=Greek (Cyprus)
Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 1f80ecf1082..686722a48c5 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -66,7 +66,7 @@ ContractRefused=Contract refused
RecruitmentCandidature=Application
JobPositions=Job positions
RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
+InterviewToDo=Contacts to follow
AnswerCandidature=Application answer
YourCandidature=Your application
YourCandidatureAnswerMessage=Thanks you for your application.
...
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 379eadef08f..8644becdd8c 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -150,4 +150,6 @@ ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
NextContainer=Next page/container
PreviousContainer=Previous page/container
-WebsiteMustBeDisabled=The website must have the status "Disabled"
+WebsiteMustBeDisabled=The website must have the status "%s"
+WebpageMustBeDisabled=The web page must have the status "%s"
+SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 6c302feddac..309e0d99f4a 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -223,9 +223,9 @@ print '';
if (empty($action) && !empty($user->rights->loan->delete)) {
if (!$disable_delete) {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 1);
} else {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 0);
}
}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 16a471ac51d..d7d91414788 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -535,7 +535,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Clone
- print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
+ if ($permissiontoadd) {
+ print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
+ }
/*
if ($permissiontoadd) {
@@ -554,8 +556,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
*/
- // Delete (need delete permission, or if draft, just need create/modify permission)
- print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+ // Delete
+ $params = array();
+ print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete, $params);
}
print '
';
if ($action != 'edit' && $user->rights->opensurvey->write) {
- //Modify button
+ // Modify button
print '
'.$langs->trans("Modify").'';
if ($object->status == Opensurveysondage::STATUS_VALIDATED) {
- //Close button
+ // Close button
print '
'.$langs->trans("Close").'';
}
if ($object->status == Opensurveysondage::STATUS_CLOSED) {
- //Opened button
+ // Re-Open
print '
'.$langs->trans("ReOpen").'';
}
- //Delete button
- print '
'.$langs->trans('Delete').'';
+ // Delete
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?suppressionsondage=1&id='.urlencode($numsondage).'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
}
print '
';
if ($action == '') {
if ($user->rights->salaries->delete) {
if (!$disable_delete) {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 1);
} else {
- print '
'.$langs->trans('Delete').'';
+ print dolGetButtonAction($langs->trans("CantRemovePaymentSalaryPaid"), $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 0);
}
}
}
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index a75a194a0e8..b4e60cf0051 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -158,7 +158,7 @@ if (empty($reshook)) {
if ($result < 0) {
setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
} else {
- setEventMessages($langs->trans('Delete'), null, 'errors');
+ setEventMessages($langs->trans('RecordDeleted'), null, 'errors');
}
$action = '';
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 49f0fc408ce..76c4784b013 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -2003,10 +2003,7 @@ if ($action == 'create') {
}
// Delete
- if (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete) {
- print '
';
- }
+ print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete);
}
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 717638fcbcb..da006de3616 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -285,7 +285,7 @@ section.setupsection {
div.tabBar textarea:focus {
border: 1px solid #aaa !important;
}
-input:focus:not(.button):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-search-takepos),
+input:focus:not(.button):not(.buttonwebsite):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-search-takepos),
select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single {
/* div.tabBar input:focus, div.tabBar select:focus { */
border-bottom: 1px solid #666 !important;
@@ -620,11 +620,12 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
-webkit-box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
-.button:disabled, .buttonDelete:disabled, .button.disabled {
+.button:disabled, .buttonDelete:disabled, .button.disabled, .buttonDelete.disabled {
opacity: 0.4;
box-shadow: none;
-webkit-box-shadow: none;
cursor: auto;
+ text-decoration: none;
}
.buttonRefused {
pointer-events: none;
@@ -5141,7 +5142,7 @@ tr.visible {
.websiteformtoolbar {
position: sticky;
top: ;
- z-index: 1000;
+ z-index: 1002; /* Dolibarr menu is 1001, Website menu is 1002 */
}
.exampleapachesetup {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9141a0d3f3c..874e77985a2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4996,7 +4996,7 @@ tr.visible {
.websiteformtoolbar {
position: sticky;
top: ;
- z-index: 1000;
+ z-index: 1002; /* Dolibarr menu is 1001, Website menu is 1002 */
}
.exampleapachesetup {
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index f7536cc15b0..35e18a9cdbc 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -501,7 +501,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
*/
// Delete (need delete permission, or if draft, just need create/modify permission)
- print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete);
}
print '