From 5acdcac75d18694dcdff2671614113f5672997f1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Apr 2024 12:25:06 +0200 Subject: [PATCH] Debug v20 --- dev/translation/ignore_translation_keys.lst | 13 ------------ htdocs/admin/modules.php | 2 +- htdocs/compta/paiement/cheque/index.php | 4 ++-- htdocs/core/lib/mailmanspip.lib.php | 4 ++-- htdocs/fourn/commande/card.php | 8 +++---- htdocs/langs/en_US/stripe.lang | 11 +++++++++- htdocs/stripe/admin/stripe.php | 1 - htdocs/theme/eldy/global.inc.php | 22 ++++++++++---------- htdocs/theme/eldy/info-box.inc.php | 23 +++++++++++++++++---- htdocs/theme/md/info-box.inc.php | 11 +++++++++- htdocs/theme/md/style.css.php | 2 +- 11 files changed, 60 insertions(+), 41 deletions(-) diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index 4e58e862175..1f6bbe80e59 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -404,11 +404,6 @@ EventFee EventIntoASerie EventOrganizationArea EventParticipant -ExampleOnlyForATBEDEITNLESCustomers -ExampleOnlyForBECustomers -ExampleOnlyForDECustomers -ExampleOnlyForKlarnaCustomers -ExampleOnlyForNLCustomers Expedition Experimental Expired @@ -519,7 +514,6 @@ MO MRP MYDATA_AADE_KEY MYDATA_AADE_USER -Mailman MainAccountForRevenueStampSaleNotDefined Manual Map @@ -755,18 +749,11 @@ Roles Rowid RulesPurchaseTurnoverCollectedOfExpenseAccounts SID -SOAPError -SPIP SQL SQLSort STATE_ STATE_IPP_ STRIPE_APPLICATION_FEE_PLATFORM -STRIPE_BANCONTACT -STRIPE_GIROPAY -STRIPE_IDEAL -STRIPE_KLARNA -STRIPE_SOFORT ST_ SaveFailed Saved diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 0a4dd01d914..dedf6b55677 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -641,7 +641,7 @@ if ($mode == 'common' || $mode == 'commonkanban') { $moreforfilter .= ''; $moreforfilter .= ' '; $moreforfilter .= '
'; - $moreforfilter .= ''; + $moreforfilter .= ''; if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) { $moreforfilter .= ' '; $moreforfilter .= ''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 98d938a23af..bd110ba8169 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -177,8 +177,8 @@ foreach ($arrayofpaymentmodetomanage as $val) { print ''.$checkdepositstatic->getNomUrl(1).''; print ''.dol_print_date($db->jdate($objp->db), 'day').''; print ''.$accountstatic->getNomUrl(1).''; - print ''.$objp->nbcheque.''; - print ''.price($objp->amount).''; + print ''.dol_escape_htmltag($objp->nbcheque).''; + print ''.price($objp->amount).''; print ''.$checkdepositstatic->LibStatut($objp->status, 3).''; print ''; diff --git a/htdocs/core/lib/mailmanspip.lib.php b/htdocs/core/lib/mailmanspip.lib.php index 7ddc9b68615..5449da31228 100644 --- a/htdocs/core/lib/mailmanspip.lib.php +++ b/htdocs/core/lib/mailmanspip.lib.php @@ -33,12 +33,12 @@ function mailmanspip_admin_prepare_head() return array( array( DOL_URL_ROOT.'/admin/mailman.php', - $langs->trans('Mailman'), + 'Mailman', 'mailman' ), array( DOL_URL_ROOT.'/admin/spip.php', - $langs->trans('SPIP'), + 'SPIP', 'spip' ) ); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index c25d8afbdd6..f56b77ae139 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1502,9 +1502,9 @@ if (empty($reshook)) { $result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, ''); if (empty($result_order["result"]["result_code"])) { //No result, check error str - setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors'); + setEventMessages($langs->trans("Error")." '".$soapclient_order->error_str."'", null, 'errors'); } elseif ($result_order["result"]["result_code"] != "OK") { //Something went wrong - setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors'); + setEventMessages($langs->trans("Error")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors'); } else { setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs'); } @@ -2892,7 +2892,7 @@ if ($action == 'create') { $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier); $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, ''); if (!$result_product) { - setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors'); + setEventMessages($line_id.$langs->trans("Error")." SOAP ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors'); $error_occurred = true; break; } @@ -2900,7 +2900,7 @@ if ($action == 'create') { // Check the result code $status_code = $result_product["result"]["result_code"]; if (empty($status_code)) { //No result, check error str - setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors'); + setEventMessages($langs->trans("Error")." SOAP '".$soapclient_order->error_str."'", null, 'errors'); } elseif ($status_code != "OK") { //Something went wrong if ($status_code == "NOT_FOUND") { setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings'); diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang index 239c1cf0345..ac750a737fe 100644 --- a/htdocs/langs/en_US/stripe.lang +++ b/htdocs/langs/en_US/stripe.lang @@ -77,4 +77,13 @@ TERMINAL_LOCATION=Location (address) for Stripe Terminals RequestDirectDebitWithStripe=Request Direct Debit with Stripe RequesCreditTransferWithStripe=Request Credit Transfer with Stripe STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe -StripeConnect_Mode=Stripe Connect mode \ No newline at end of file +STRIPE_KLARNA=Enable the payments using Klarna +STRIPE_BANCONTACT=Enable the payments using BANCONTACT +STRIPE_IDEAL=Enable the payments using IDEAL +STRIPE_GIROPAY=Enable the payments using GIROPAY +STRIPE_SOFORT=Enable the payments using SOFORT +StripeConnect_Mode=Stripe Connect mode +ExampleOnlyForBECustomers=Only for belgium customers +ExampleOnlyForDECustomers=Only for german customers +ExampleOnlyForNLCustomers=Only for dutch customers +ExampleOnlyForATBEDEITNLESCustomers=Only for customers from Austria, Belgium, Germany, Italy, Netherlands, Spain diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 919e80088c6..a62cdadb471 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -474,7 +474,6 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { // TODO Not used by current c $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); print $form->selectarray("STRIPE_KLARNA", $arrval, $conf->global->STRIPE_KLARNA); } - print '   '.$langs->trans("ExampleOnlyForKlarnaCustomers").''; print ''; } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 673f568a7e4..215a2ed46a8 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1815,8 +1815,8 @@ maxscreenheightless200 { .width100p { width:100%; } -/* Force values for small screen 1400 */ -@media only screen and (max-width: 1400px) +/* Force values for small screen 1440 */ +@media only screen and (max-width: 1440px) { .titlefield { /* width: 30% !important; */ } .titlefieldcreate { width: 30% !important; } @@ -1862,8 +1862,8 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select } -/* Force values for small screen 767 */ -@media only screen and (max-width: 767px) +/* Force values for small screen 768 */ +@media only screen and (max-width: 768px) { div.refidno { font-size: !important; @@ -2393,7 +2393,7 @@ div.secondcolumn div.box { /* Force values on one column for small screen */ -@media only screen and (max-width: 1000px) +@media only screen and (max-width: 1024px) { div.fiche { margin-: px; @@ -2436,7 +2436,7 @@ div.secondcolumn div.box { } /* Force values on one column for small screen */ -@media only screen and (max-width: 1499px) +@media only screen and (max-width: 1440px) { div.fichehalfleft-lg { float: none; @@ -4687,7 +4687,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) { } -@media only screen and (max-width: 767px) +@media only screen and (max-width: 768px) { .tabBar .arearef .pagination.paginationref { max-width: calc(50%); @@ -7279,7 +7279,7 @@ div.tabsElem a.tab { padding-right: 10px; padding-bottom: 2px; } -@media only screen and (max-width: 767px) +@media only screen and (max-width: 768px) { .menu_choix1 a, .menu_choix2 a { background-size: 36px 36px; @@ -7319,7 +7319,7 @@ div.tabsElem a.tab { color: var(--colortextbackvmenu); } -@media only screen and (max-width: 767px) +@media only screen and (max-width: 768px) { .publicnewmemberform div.tabBarWithBottom { padding: 10px; @@ -7347,7 +7347,7 @@ div.tabsElem a.tab { padding-right: 50px; padding-top: 30px; } -@media only screen and (max-width: 767px) +@media only screen and (max-width: 768px) { .ticketlargemargin { padding-left: 5px; padding-right: 5px; @@ -7878,7 +7878,7 @@ table.jPicker { background-size: 22px auto; top: 2px; } -@media only screen and (max-width: 767px) +@media only screen and (max-width: 768px) { .imgopensurveywizard, .imgautosize { width:95%; height: auto; } diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 380ce399eb6..013d6d43da6 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -20,7 +20,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { .info-box { display: block; position: relative; - min-height: 90px; + min-height: 92px; /* must be same height than info-box-icon */ background: var(--colorbacklineimpair2); width: 100%; box-shadow: 1px 1px 15px rgba(192, 192, 192, 0.2); @@ -83,11 +83,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { display: block; overflow: hidden; float: left; - height: 90px; + line-height: 92px; /* must be same height as info-box */ + height: 92px; /* must be same height as info-box */ width: 88px; text-align: center; font-size: 2.8em; - line-height: 90px; background: var(--colorbacktitle1) !important; } @@ -540,12 +540,27 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { } } -@media only screen and (max-width: 767px) { +@media only screen and (max-width: 768px) { .info-box-module { min-width: 260px; } + .box-flex-item { + width: 280px; + } } +@media only screen and (max-width: 480px) { + .info-box-module { + min-width: 250px; + } + .box-flex-item { + width: 250px; + } +} + + + + .info-box-module .info-box-content { height: 98px; } diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php index 98e2e033085..e1959f43f21 100644 --- a/htdocs/theme/md/info-box.inc.php +++ b/htdocs/theme/md/info-box.inc.php @@ -595,7 +595,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { max-width: 315px; } } -@media only screen and (max-width: 767px) { +@media only screen and (max-width: 768px) { .info-box-module { min-width: 260px; } @@ -616,3 +616,12 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { max-width: calc(100% - 82px); } } + +@media only screen and (max-width: 480px) { + .info-box-module { + min-width: 250px; + } + .box-flex-item { + width: 250px; + } +} diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index bef0116fa62..4bd932b6700 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -363,7 +363,7 @@ print '*/'."\n"; --amountremaintopaybackcolor:none; --productlinestockod: #002200; --productlinestocktoolow: #884400; - --infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #2b2d2f, #2b2d2f, #2b2d2f, #e4efe8); + --infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8); --tablevalidbgcolor: rgb(252, 248, 227); --butactionbg : #; --textbutaction : #;