Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug credit transfer

Browse Source
This commit is contained in:
Laurent Destailleur
2020-05-27 22:35:55 +02:00
parent 15f2165c12
commit e37e45f984
11 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/modules.php
View File

@@ -543,8 +543,8 @@ if ($mode == 'common' || $mode == 'commonkanban')
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
$moreforfilter .= '<div class="floatright right">'; $moreforfilter .= '<div class="floatright right">';
$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list paddingleft imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', 1, array('morecss'=>'reposition')); $moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list paddingleft imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'common' ? '' : ' btnTitleSelected')));
$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', 1, array('morecss'=>'reposition')); $moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'commonkanban' ? '' : ' btnTitleSelected')));
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
$moreforfilter .= '<div class="floatright right margintoponly marginrightonly" style="padding-top: 3px">'.$moreinfo.'</div>'; $moreforfilter .= '<div class="floatright right margintoponly marginrightonly" style="padding-top: 3px">'.$moreinfo.'</div>';
@@ -654,7 +654,8 @@ if ($mode == 'common' || $mode == 'commonkanban')
} }
$familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label']; $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label'];
print load_fiche_titre($familytext, '', '');
print load_fiche_titre($familytext, '', '', 0, '', 'modulefamilygroup');
if ($mode == 'commonkanban') { if ($mode == 'commonkanban') {
print '<div class="box-flex-container">'; print '<div class="box-flex-container">';

2
htdocs/core/lib/functions.lib.php
View File

@@ -1205,7 +1205,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
$out = "\n".'<!-- dol_get_fiche_head -->'; $out = "\n".'<!-- dol_get_fiche_head -->';
if ((!empty($title) && $showtitle) || $morehtmlright || !empty($links)) { if ((!empty($title) && $showtitle) || $morehtmlright || !empty($links)) {
$out .= '<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n"; $out .= '<div class="tabs'.($picto ? '' : ' nopaddingleft').'" data-role="controlgroup" data-type="horizontal">'."\n";
} }
// Show right part // Show right part

12
htdocs/core/modules/DolibarrModules.class.php
View File

@@ -2321,24 +2321,24 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
print '</div> print '</div>
<div class="info-box-content info-box-text-module"> <div class="info-box-content info-box-text-module">
<span class="info-box-title marginbottomonly">'.$this->getName().'</span> <span class="info-box-title">'.$this->getName().'</span>
<span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>'; <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
/*print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">'; /*print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
print $this->getVersion(1); print $this->getVersion(1);
print '</span>'; */ print '</span>'; */
print '<div class="valignmiddle inline-block">'; print '<div class="valignmiddle inline-block info-box-more">';
print '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$this->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>'; print '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$this->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
print '</div><br>'; print '</div><br>';
print '<div class="valignmiddle inline-block info-box-actions">'; print '<div class="valignmiddle inline-block info-box-actions">';
print '<div class="valignmiddle inline-block">'; print '<div class="valignmiddle inline-block info-box-setup">';
print $codeenabledisable;
print '</div>';
print '<div class="valignmiddle inline-block marginleftonly">';
print $codetoconfig; print $codetoconfig;
print '</div>'; print '</div>';
print '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
print $codeenabledisable;
print '</div>';
print '</div>'; print '</div>';
print ' print '

4
htdocs/langs/en_US/admin.lang
View File

@@ -541,8 +541,8 @@ Module54Name=Contracts/Subscriptions
Module54Desc=Management of contracts (services or recurring subscriptions) Module54Desc=Management of contracts (services or recurring subscriptions)
Module55Name=Barcodes Module55Name=Barcodes
Module55Desc=Barcode management Module55Desc=Barcode management
Module56Name=Payment by bank transfer Module56Name=Payment by credit transfer
Module56Desc=Management of payment by bank transfer orders. It includes generation of SEPA file for European countries. Module56Desc=Management of payment by credit transfer orders. It includes generation of SEPA file for European countries.
Module57Name=Bank Direct Debit payments Module57Name=Bank Direct Debit payments
Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries. Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
Module58Name=ClickToDial Module58Name=ClickToDial

6
htdocs/langs/en_US/banks.lang
View File

@@ -35,10 +35,10 @@ SwiftValid=BIC/SWIFT valid
SwiftVNotalid=BIC/SWIFT not valid SwiftVNotalid=BIC/SWIFT not valid
IbanValid=BAN valid IbanValid=BAN valid
IbanNotValid=BAN not valid IbanNotValid=BAN not valid
StandingOrders=Direct Debit orders StandingOrders=Direct debit orders
StandingOrder=Direct debit order StandingOrder=Direct debit order
PaymentByBankTransfers=Payments by bank transfer PaymentByBankTransfers=Payments by credit transfer
PaymentByBankTransfer=Payment by bank transfer PaymentByBankTransfer=Payment by credit transfer
AccountStatement=Account statement AccountStatement=Account statement
AccountStatementShort=Statement AccountStatementShort=Statement
AccountStatements=Account statements AccountStatements=Account statements

4
htdocs/langs/en_US/bills.lang
View File

@@ -241,10 +241,6 @@ EscompteOffered=Discount offered (payment before term)
EscompteOfferedShort=Discount EscompteOfferedShort=Discount
SendBillRef=Submission of invoice %s SendBillRef=Submission of invoice %s
SendReminderBillRef=Submission of invoice %s (reminder) 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 NoDraftBills=No draft invoices
NoOtherDraftBills=No other draft invoices NoOtherDraftBills=No other draft invoices
NoDraftInvoices=No draft invoices NoDraftInvoices=No draft invoices

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

@@ -4,13 +4,13 @@ SuppliersStandingOrdersArea=Direct credit payment orders area
StandingOrdersPayment=Direct debit payment orders StandingOrdersPayment=Direct debit payment orders
StandingOrderPayment=Direct debit payment order StandingOrderPayment=Direct debit payment order
NewStandingOrder=New direct debit order NewStandingOrder=New direct debit order
NewPaymentByBankTransfer=New payment by bank transfer NewPaymentByBankTransfer=New payment by credit transfer
StandingOrderToProcess=To process StandingOrderToProcess=To process
PaymentByBankTransferReceipts=Bank transfer orders PaymentByBankTransferReceipts=Credit transfer orders
PaymentByBankTransferLines=Bank transfer order lines PaymentByBankTransferLines=Credit transfer order lines
WithdrawalsReceipts=Direct debit orders WithdrawalsReceipts=Direct debit orders
WithdrawalReceipt=Direct debit order WithdrawalReceipt=Direct debit order
LatestBankTransferReceipts=Latest %s bank transfer orders LatestBankTransferReceipts=Latest %s credit transfer orders
LastWithdrawalReceipts=Latest %s direct debit files LastWithdrawalReceipts=Latest %s direct debit files
WithdrawalsLines=Direct debit order lines WithdrawalsLines=Direct debit order lines
RequestStandingOrderToTreat=Request for direct debit payment order to process 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. 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 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 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 NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by bank transfer SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
InvoiceWaitingWithdraw=Invoice waiting for direct debit InvoiceWaitingWithdraw=Invoice waiting for direct debit
AmountToWithdraw=Amount to withdraw AmountToWithdraw=Amount to withdraw
WithdrawsRefused=Direct debit refused WithdrawsRefused=Direct debit refused

2
htdocs/theme/eldy/btn.inc.php
View File

@@ -7,7 +7,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
--btncolorbg: #fbfbfb; --btncolorbg: #fbfbfb;
--btncolorborderhover: none; --btncolorborderhover: none;
--btncolorborder: #FFF; --btncolorborder: #FFF;
--butactionbg:rgb(225, 235, 225); --butactionbg:rgb(215, 235, 225);
--butactiondeletebg: rgb(234,228,225); --butactiondeletebg: rgb(234,228,225);
} }

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

@@ -2651,8 +2651,8 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
div.tabs { div.tabs {
text-align: <?php print $left; ?>; text-align: <?php print $left; ?>;
padding-top: 10px; padding-top: 10px;
padding-left: 6px !important; padding-left: 6px;
padding-right: 6px !important; padding-right: 6px;
clear:both; clear:both;
height:100%; height:100%;
} }
@@ -2870,6 +2870,9 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
.nopaddingleft { .nopaddingleft {
padding-<?php print $left; ?>: 0px; padding-<?php print $left; ?>: 0px;
} }
div.tabs.nopaddingleft {
padding-<?php print $left; ?>: 0px;
}
.nopaddingright { .nopaddingright {
padding-<?php print $right; ?>: 0px; padding-<?php print $right; ?>: 0px;
} }

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

@@ -17,15 +17,21 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
min-height: 90px; min-height: 90px;
/* background: #fff; */ /* background: #fff; */
width: 100%; 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-radius: 2px;
border: 1px solid #eee; border: 1px solid #e9e9e9;
margin-bottom: 15px; margin-bottom: 15px;
} }
.info-box.info-box-sm{ .info-box.info-box-sm{
min-height: 80px; min-height: 80px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.info-box-more {
float: right;
top: 6px;
position: absolute;
right: 10px;
}
.info-box small { .info-box small {
font-size: 14px; font-size: 14px;
@@ -74,13 +80,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
height: 80px; height: 80px;
width: 80px; width: 80px;
font-size: 25px; font-size: 25px;
line-height: 100px; line-height: 92px;
} }
.opened-dash-board-wrap .info-box-sm .info-box-icon { .opened-dash-board-wrap .info-box-sm .info-box-icon {
line-height: 80px; line-height: 80px;
} }
.info-box-module .info-box-icon { .info-box-module .info-box-icon {
height: 107px; height: 98px;
} }
.info-box-icon > img { .info-box-icon > img {
max-width: 100%; max-width: 100%;
@@ -152,12 +158,19 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
.info-box-content { .info-box-content {
padding: 5px 10px; padding: 5px 10px;
margin-left: 90px; margin-left: 84px;
} }
.info-box-sm .info-box-content{ .info-box-sm .info-box-content{
margin-left: 80px; margin-left: 80px;
} }
/*.info-box-setup span {
color: var(--colortexttitlenotab2);
}
.tdsetuppicto span {
color: var(--colortexttitlenotab2);
}*/
.info-box-number { .info-box-number {
display: block; display: block;
font-weight: bold; font-weight: bold;
@@ -175,7 +188,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
.info-box-title{ .info-box-title{
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
padding-bottom: 4px; margin-bottom: 6px;
/* padding-bottom: 4px; */
} }
.info-box-text{ .info-box-text{
font-size: 0.92em; font-size: 0.92em;
@@ -373,7 +387,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
max-width: 350px; max-width: 350px;
} }
.info-box-module .info-box-content { .info-box-module .info-box-content {
height: 7em; height: 6.4em;
} }
/* Disabled. This break the responsive on smartphone /* Disabled. This break the responsive on smartphone
.box{ .box{

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

@@ -3,14 +3,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
/* ICONS INFO BOX */ /*
* Component: Info Box
* -------------------
*/
<?php <?php
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$prefix = ''; $prefix = '';
if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.5; if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7;
if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
?> ?>
@@ -97,12 +101,18 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
/* box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); */ /* box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); */
border-radius: 2px; border-radius: 2px;
margin-bottom: 15px; margin-bottom: 15px;
border: 1px solid #ddd; border: 1px solid #e9e9e9;
} }
.info-box.info-box-sm{ .info-box.info-box-sm{
min-height: 80px; min-height: 80px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.info-box-more {
float: right;
top: 4px;
position: absolute;
right: 10px;
}
.info-box small { .info-box small {
font-size: 14px; font-size: 14px;
@@ -149,13 +159,13 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
.info-box-sm .info-box-icon { .info-box-sm .info-box-icon {
width: 80px; width: 80px;
font-size: 25px; font-size: 25px;
line-height: 100px; line-height: 92px;
} }
.opened-dash-board-wrap .info-box-sm .info-box-icon { .opened-dash-board-wrap .info-box-sm .info-box-icon {
line-height: 80px; line-height: 80px;
} }
.info-box-module .info-box-icon { .info-box-module .info-box-icon {
height: 108px; height: 98px;
} }
.info-box-icon > img { .info-box-icon > img {
max-width: 100%; max-width: 100%;
@@ -163,10 +173,6 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
.info-box-module .info-box-icon > img { .info-box-module .info-box-icon > img {
max-width: 55%; max-width: 55%;
} }
.info-box-content {
padding: 5px 10px;
margin-left: 90px;
}
.info-box-icon-text{ .info-box-icon-text{
box-sizing: border-box; box-sizing: border-box;
@@ -232,7 +238,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
.info-box-content { .info-box-content {
padding: 5px 10px; padding: 5px 10px;
margin-left: 90px; margin-left: 84px;
} }
.info-box-number { .info-box-number {
@@ -252,10 +258,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
.info-box-title{ .info-box-title{
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
padding-bottom: 5px; margin-bottom: 6px;
} }
.info-box-text{ .info-box-text{
font-size: 12px; font-size: 0.92em;
} }
.info-box-text:first-letter{text-transform: uppercase} .info-box-text:first-letter{text-transform: uppercase}
a.info-box-text{ text-decoration: none;} a.info-box-text{ text-decoration: none;}
@@ -434,5 +440,5 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
max-width: 350px; max-width: 350px;
} }
.info-box-module .info-box-content { .info-box-module .info-box-content {
height: 7em; height: 6.3em;
} }