';
- print '
';
- print $codeenabledisable;
- print '
';
- print '
';
+ print '
';
print $codetoconfig;
print '
';
+ print '
';
+ print $codeenabledisable;
+ print '
';
print '
';
print '
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fef27b5b7de..bee43c2569f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -541,8 +541,8 @@ Module54Name=Contracts/Subscriptions
Module54Desc=Management of contracts (services or recurring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
-Module56Name=Payment by bank transfer
-Module56Desc=Management of payment by bank transfer orders. It includes generation of SEPA file for European countries.
+Module56Name=Payment by credit transfer
+Module56Desc=Management of payment by credit transfer orders. It includes generation of SEPA file for European countries.
Module57Name=Bank Direct Debit payments
Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
Module58Name=ClickToDial
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 48bd2b81c2e..17ebc2ff7ed 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -35,10 +35,10 @@ SwiftValid=BIC/SWIFT valid
SwiftVNotalid=BIC/SWIFT not valid
IbanValid=BAN valid
IbanNotValid=BAN not valid
-StandingOrders=Direct Debit orders
+StandingOrders=Direct debit orders
StandingOrder=Direct debit order
-PaymentByBankTransfers=Payments by bank transfer
-PaymentByBankTransfer=Payment by bank transfer
+PaymentByBankTransfers=Payments by credit transfer
+PaymentByBankTransfer=Payment by credit transfer
AccountStatement=Account statement
AccountStatementShort=Statement
AccountStatements=Account statements
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 2857b461e7b..1e562909360 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -241,10 +241,6 @@ EscompteOffered=Discount offered (payment before term)
EscompteOfferedShort=Discount
SendBillRef=Submission of invoice %s
SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
-PaymentByBankTransfers=Payments by bank transfer
-PaymentByBankTransfer=Payment by bank transfer
NoDraftBills=No draft invoices
NoOtherDraftBills=No other draft invoices
NoDraftInvoices=No draft invoices
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a1e5521bef7..fb6c56687ee 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -4,13 +4,13 @@ SuppliersStandingOrdersArea=Direct credit payment orders area
StandingOrdersPayment=Direct debit payment orders
StandingOrderPayment=Direct debit payment order
NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by bank transfer
+NewPaymentByBankTransfer=New payment by credit transfer
StandingOrderToProcess=To process
-PaymentByBankTransferReceipts=Bank transfer orders
-PaymentByBankTransferLines=Bank transfer order lines
+PaymentByBankTransferReceipts=Credit transfer orders
+PaymentByBankTransferLines=Credit transfer order lines
WithdrawalsReceipts=Direct debit orders
WithdrawalReceipt=Direct debit order
-LatestBankTransferReceipts=Latest %s bank transfer orders
+LatestBankTransferReceipts=Latest %s credit transfer orders
LastWithdrawalReceipts=Latest %s direct debit files
WithdrawalsLines=Direct debit order lines
RequestStandingOrderToTreat=Request for direct debit payment order to process
@@ -18,8 +18,8 @@ RequestStandingOrderTreated=Request for direct debit payment order processed
NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by bank transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by bank transfer
+NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
+SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
InvoiceWaitingWithdraw=Invoice waiting for direct debit
AmountToWithdraw=Amount to withdraw
WithdrawsRefused=Direct debit refused
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index ed5097f5944..5642a40c0e7 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -7,7 +7,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
--btncolorbg: #fbfbfb;
--btncolorborderhover: none;
--btncolorborder: #FFF;
- --butactionbg:rgb(225, 235, 225);
+ --butactionbg:rgb(215, 235, 225);
--butactiondeletebg: rgb(234,228,225);
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3f6d999104e..8d9c0276ac4 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2651,8 +2651,8 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
div.tabs {
text-align: ;
padding-top: 10px;
- padding-left: 6px !important;
- padding-right: 6px !important;
+ padding-left: 6px;
+ padding-right: 6px;
clear:both;
height:100%;
}
@@ -2870,6 +2870,9 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
.nopaddingleft {
padding-: 0px;
}
+div.tabs.nopaddingleft {
+ padding-: 0px;
+}
.nopaddingright {
padding-: 0px;
}
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index a0f54591534..badc7f2d655 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -17,15 +17,21 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
min-height: 90px;
/* background: #fff; */
width: 100%;
- box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
+ box-shadow: 1px 1px 2px rgba(128, 128, 128, 0.2);
border-radius: 2px;
- border: 1px solid #eee;
+ border: 1px solid #e9e9e9;
margin-bottom: 15px;
}
.info-box.info-box-sm{
min-height: 80px;
margin-bottom: 10px;
}
+.info-box-more {
+ float: right;
+ top: 6px;
+ position: absolute;
+ right: 10px;
+}
.info-box small {
font-size: 14px;
@@ -74,13 +80,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
height: 80px;
width: 80px;
font-size: 25px;
- line-height: 100px;
+ line-height: 92px;
}
.opened-dash-board-wrap .info-box-sm .info-box-icon {
line-height: 80px;
}
.info-box-module .info-box-icon {
- height: 107px;
+ height: 98px;
}
.info-box-icon > img {
max-width: 100%;
@@ -152,12 +158,19 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
.info-box-content {
padding: 5px 10px;
- margin-left: 90px;
+ margin-left: 84px;
}
.info-box-sm .info-box-content{
margin-left: 80px;
}
+/*.info-box-setup span {
+ color: var(--colortexttitlenotab2);
+}
+.tdsetuppicto span {
+ color: var(--colortexttitlenotab2);
+}*/
+
.info-box-number {
display: block;
font-weight: bold;
@@ -175,7 +188,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
.info-box-title{
text-transform: uppercase;
font-weight: bold;
- padding-bottom: 4px;
+ margin-bottom: 6px;
+ /* padding-bottom: 4px; */
}
.info-box-text{
font-size: 0.92em;
@@ -373,7 +387,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
max-width: 350px;
}
.info-box-module .info-box-content {
- height: 7em;
+ height: 6.4em;
}
/* Disabled. This break the responsive on smartphone
.box{
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 65ff1811269..f1c58b4241e 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -3,14 +3,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
/*