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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Alexandre SPANGARO 2022-09-06 21:32:58 +02:00 committed by GitHub
commit 7b560c19e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/withdrawals.lang
View File

@ -118,7 +118,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
SepaMandate=SEPA Direct Debit Mandate SepaMandate=SEPA Direct Debit Mandate
SepaMandateShort=SEPA Mandate SepaMandateShort=SEPA Mandate
PleaseReturnMandate=Please return this mandate form by email to %s or by mail to PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
CreditorIdentifier=Creditor Identifier CreditorIdentifier=Creditor Identifier
CreditorName=Creditor Name CreditorName=Creditor Name
SEPAFillForm=(B) Please complete all the fields marked * SEPAFillForm=(B) Please complete all the fields marked *

2
htdocs/societe/paymentmodes.php
View File

@ -863,7 +863,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="socid" value="'.$object->id.'">'; print '<input type="hidden" name="socid" value="'.$object->id.'">';
print img_picto($langs->trans("CreateCustomerOnStripe"), 'stripe'); print img_picto($langs->trans("CreateCustomerOnStripe"), 'stripe');
print '<input type="submit" class="buttonreset nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">'; print '<input type="submit" class="buttonlink nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
print '</form>'; print '</form>';
} }
print '</td></tr>'; print '</td></tr>';

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

@ -3545,6 +3545,14 @@ input.button[name="upload"] {
input.button.smallpaddingimp, input.buttonreset.smallpaddingimp { input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
font-size: 0.8em; font-size: 0.8em;
} }
input.buttonlink {
color: var(--colortextlink);
background-color: transparent;
cursor: pointer;
}
input.buttonlink:hover {
text-decoration: underline;
}
input.buttonreset { input.buttonreset {
margin-top: 3px; margin-top: 3px;
margin-bottom: 3px; margin-bottom: 3px;

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

@ -3511,6 +3511,14 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
.smallpaddingimp { .smallpaddingimp {
padding: 4px !important; padding: 4px !important;
} }
input.buttonlink {
color: var(--colortextlink);
background-color: transparent;
cursor: pointer;
}
input.buttonlink:hover {
text-decoration: underline;
}
input.buttonreset { input.buttonreset {
margin-top: 3px; margin-top: 3px;
margin-bottom: 3px; margin-bottom: 3px;

2
htdocs/user/list.php
View File

@ -111,7 +111,7 @@ $fieldstosearchall = array(
'u.user_mobile'=>"PhoneMobile", 'u.user_mobile'=>"PhoneMobile",
'u.email'=>"EMail", 'u.email'=>"EMail",
'u.note_public'=>"NotePublic", 'u.note_public'=>"NotePublic",
'u.note_private'=>"NotePrivate", 'u.note_private'=>"NotePrivate"
); );
if (!empty($conf->api->enabled)) { if (!empty($conf->api->enabled)) {
$fieldstosearchall['u.api_key'] = "ApiKey"; $fieldstosearchall['u.api_key'] = "ApiKey";