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

Fix use short labels for workboard

Browse Source
This commit is contained in:
Laurent Destailleur 2019-08-19 10:01:42 +02:00
parent 2587dc041f
commit 6abfd8b145
6 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/class/account.class.php
View File

@ -1224,6 +1224,7 @@ class Account extends CommonObject
$response = new WorkboardResponse(); $response = new WorkboardResponse();
$response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24; $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
$response->label=$langs->trans("TransactionsToConciliate"); $response->label=$langs->trans("TransactionsToConciliate");
$response->labelShort = $langs->trans("TransactionsToConciliateShort");
$response->url=DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&mainmenu=bank'; $response->url=DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&mainmenu=bank';
$response->img=img_object('', "payment"); $response->img=img_object('', "payment");
@ -1275,7 +1276,6 @@ class Account extends CommonObject
$this->nb["banklines"]=$obj->nb; $this->nb["banklines"]=$obj->nb;
} }
$this->db->free($resql); $this->db->free($resql);
return 1;
} }
else else
{ {

1
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -527,6 +527,7 @@ class RemiseCheque extends CommonObject
$response = new WorkboardResponse(); $response = new WorkboardResponse();
$response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24; $response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
$response->label=$langs->trans("BankChecksToReceipt"); $response->label=$langs->trans("BankChecksToReceipt");
$response->labelShort=$langs->trans("BankChecksToReceiptShort");
$response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank'; $response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank';
$response->img=img_object('', "payment"); $response->img=img_object('', "payment");

15
htdocs/index.php
View File

@ -659,21 +659,6 @@ if ($showweather)
$boxwork.='</th>'; $boxwork.='</th>';
$boxwork.='</tr>'."\n"; $boxwork.='</tr>'."\n";
/*if ($showweather)
{
$boxwork.='<tr class="nohover">';
$boxwork.='<td class="nohover'.($conf->global->MAIN_DISABLE_METEO == 2 ?' hideonsmartphone' : '').' center valignmiddle">';
$text='';
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
else $text=$langs->transnoentitiesnoconv("NoItemLate");
$text.='. '.$langs->transnoentitiesnoconv("LateDesc");
//$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
$options='height="64px"';
$boxwork.=showWeather($totallate, $text, $options);
$boxwork.='</td>';
$boxwork.='</tr>';
}*/
// Show dashboard // Show dashboard
$nbworkboardempty=0; $nbworkboardempty=0;
$isIntopOpenedDashBoard = array(); $isIntopOpenedDashBoard = array();

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

@ -73,6 +73,7 @@ BankTransaction=Bank entry
ListTransactions=List entries ListTransactions=List entries
ListTransactionsByCategory=List entries/category ListTransactionsByCategory=List entries/category
TransactionsToConciliate=Entries to reconcile TransactionsToConciliate=Entries to reconcile
TransactionsToConciliateShort=To reconcile
Conciliable=Can be reconciled Conciliable=Can be reconciled
Conciliate=Reconcile Conciliate=Reconcile
Conciliation=Reconciliation Conciliation=Reconciliation
@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt? ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
BankChecks=Bank checks BankChecks=Bank checks
BankChecksToReceipt=Checks awaiting deposit BankChecksToReceipt=Checks awaiting deposit
BankChecksToReceiptShort=Checks awaiting deposit
ShowCheckReceipt=Show check deposit receipt ShowCheckReceipt=Show check deposit receipt
NumberOfCheques=No. of check NumberOfCheques=No. of check
DeleteTransaction=Delete entry DeleteTransaction=Delete entry

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

@ -16,7 +16,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
margin-bottom: 15px; margin-bottom: 15px;
} }
.info-box.info-box-sm{ .info-box.info-box-sm{
min-height: 70px; min-height: 80px;
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -63,8 +63,8 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
} }
.info-box-sm .info-box-icon{ .info-box-sm .info-box-icon{
height: 70px; height: 80px;
width: 70px; width: 80px;
font-size: 25px; font-size: 25px;
line-height: 70px; line-height: 70px;
} }
@ -77,7 +77,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
} }
.info-box-sm .info-box-content{ .info-box-sm .info-box-content{
margin-left: 70px; margin-left: 80px;
} }
.info-box-number { .info-box-number {
display: block; display: block;

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

@ -78,7 +78,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
font-weight: bold; font-weight: bold;
} }
.info-box-text{ .info-box-text{
font-size: 0.92em; font-size: 12px;
} }
.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;}