Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur 2024-04-03 12:25:06 +02:00
parent c31c766431
commit 5acdcac75d
11 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev/translation/ignore_translation_keys.lst
View File

@ -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

2
htdocs/admin/modules.php
View File

@ -641,7 +641,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= '</div>';
$moreforfilter .= ' ';
$moreforfilter .= '<div class="divsearchfield valignmiddle inline-block">';
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small nomarginleft" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
$moreforfilter .= ' ';
$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';

4
htdocs/compta/paiement/cheque/index.php
View File

@ -177,8 +177,8 @@ foreach ($arrayofpaymentmodetomanage as $val) {
print '<td class="nowraponall">'.$checkdepositstatic->getNomUrl(1).'</td>';
print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
print '<td class="nowraponall">'.$accountstatic->getNomUrl(1).'</td>';
print '<td class="right">'.$objp->nbcheque.'</td>';
print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
print '<td class="right">'.dol_escape_htmltag($objp->nbcheque).'</td>';
print '<td class="right"><span class="amount nowraponall">'.price($objp->amount).'</span></td>';
print '<td class="right">'.$checkdepositstatic->LibStatut($objp->status, 3).'</td>';
print '</tr>';

4
htdocs/core/lib/mailmanspip.lib.php
View File

@ -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'
)
);

8
htdocs/fourn/commande/card.php
View File

@ -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');

11
htdocs/langs/en_US/stripe.lang
View File

@ -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
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

1
htdocs/stripe/admin/stripe.php
View File

@ -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 ' &nbsp; <span class="opacitymedium">'.$langs->trans("ExampleOnlyForKlarnaCustomers").'</span>';
print '</td></tr>';
}

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

@ -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: <?php print is_numeric($fontsize) ? ((int) $fontsize + 3).'px' : $fontsize; ?> !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-<?php print $left; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '6' : '20')); ?>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; }

23
htdocs/theme/eldy/info-box.inc.php
View File

@ -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;
}

11
htdocs/theme/md/info-box.inc.php
View File

@ -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;
}
}

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

@ -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 : #<?php print $butactionbg; ?>;
--textbutaction : #<?php print $textbutaction; ?>;