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

Look and feel v12

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-09 16:36:39 +02:00
parent 5819aadf75
commit 6a60678186
26 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/categories/class/categorie.class.php
View File

@ -1362,9 +1362,10 @@ class Categorie extends CommonObject
* @param string $sep Separator * @param string $sep Separator
* @param string $url Url * @param string $url Url
* @param int $nocolor 0 * @param int $nocolor 0
* @param string $addpicto Add picto into link
* @return array * @return array
*/ */
public function print_all_ways($sep = " >> ", $url = '', $nocolor = 0) public function print_all_ways($sep = ' >> ', $url = '', $nocolor = 0, $addpicto = 0)
{ {
// phpcs:enable // phpcs:enable
$ways = array(); $ways = array();
@ -1397,11 +1398,11 @@ class Categorie extends CommonObject
{ {
$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">'; $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
$linkend = '</a>'; $linkend = '</a>';
$w[] = $link.$cat->label.$linkend; $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
} }
else else
{ {
$w[] = "<a href='".DOL_URL_ROOT."/$url?catid=".$cat->id."'>".$cat->label."</a>"; $w[] = "<a href='".DOL_URL_ROOT."/".$url."?catid=".$cat->id."'>".($addpicto ? img_object('', 'category') : '').$cat->label."</a>";
} }
} }
$newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w)); $newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));

2
htdocs/categories/index.php
View File

@ -86,7 +86,7 @@ print '<table class="noborder nohover centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("Search").'</td>'; print '<td colspan="3">'.$langs->trans("Search").'</td>';
print '</tr>'; print '</tr>';
print '<tr class="oddeven"><td>'; print '<tr class="oddeven nohover"><td>';
print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'; print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
/* /*
// faire une rech dans une sous categorie uniquement // faire une rech dans une sous categorie uniquement

6
htdocs/categories/viewcat.php
View File

@ -313,7 +313,7 @@ if (! empty($user->rights->categorie->creer))
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print load_fiche_titre($langs->trans("SubCats"), $newcardbutton); print load_fiche_titre($langs->trans("SubCats"), $newcardbutton, 'object_category');
print '<table class="liste nohover" width="100%">'; print '<table class="liste nohover" width="100%">';
@ -784,7 +784,7 @@ if ($type == Categorie::TYPE_CONTACT)
} }
} }
// List of accounts // List of bank accounts
if ($type == Categorie::TYPE_ACCOUNT) if ($type == Categorie::TYPE_ACCOUNT)
{ {
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@ -807,7 +807,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
print '<br>'; print '<br>';
$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = ''; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit); print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
print "<table class='noborder' width='100%'>\n"; print "<table class='noborder' width='100%'>\n";
print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n"; print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";

2
htdocs/compta/bank/bankentries_list.php
View File

@ -817,7 +817,7 @@ if ($resql)
$morehtml .= $newcardbutton; $morehtml .= $newcardbutton;
$picto = 'title_bank'; $picto = 'bank_account';
if ($id > 0 || !empty($ref)) $picto = ''; if ($id > 0 || !empty($ref)) $picto = '';
print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit); print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);

2
htdocs/compta/bank/budget.php
View File

@ -44,7 +44,7 @@ $companystatic=new Societe($db);
llxHeader(); llxHeader();
// List movements bu category for bank transactions // List movements bu category for bank transactions
print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png'); print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'bank_account');
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";

4
htdocs/compta/bank/card.php
View File

@ -321,7 +321,7 @@ if ($action == 'create')
{ {
$object = new Account($db); $object = new Account($db);
print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png'); print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
@ -804,7 +804,7 @@ else
$object = new Account($db); $object = new Account($db);
$object->fetch(GETPOST('id', 'int')); $object->fetch(GETPOST('id', 'int'));
print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png'); print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'bank_account');
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {

2
htdocs/compta/bank/categ.php
View File

@ -79,7 +79,7 @@ if ($categid) {
llxHeader(); llxHeader();
print load_fiche_titre($langs->trans("RubriquesTransactions")); print load_fiche_titre($langs->trans("RubriquesTransactions"), '', 'object_category');
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">'; if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

2
htdocs/compta/bank/line.php
View File

@ -628,7 +628,7 @@ if ($result)
// Releve rappro // Releve rappro
if ($acct->canBeConciliated() > 0) // Si compte rapprochable if ($acct->canBeConciliated() > 0) // Si compte rapprochable
{ {
print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png'); print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
print '<hr>'."\n"; print '<hr>'."\n";
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">'; print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';

3
htdocs/compta/bank/list.php
View File

@ -141,7 +141,6 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
} }
/* /*
* View * View
*/ */
@ -267,7 +266,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit, 1); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
$topicmail = "Information"; $topicmail = "Information";
//$modelmail="subscription"; //$modelmail="subscription";

2
htdocs/compta/bank/releve.php
View File

@ -383,7 +383,7 @@ else
$title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts'); $title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
print load_fiche_titre($title, $mesprevnext, ''); print load_fiche_titre($title, $mesprevnext, '');
//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'title_bank.png', 0, '', '', 0, 1); //print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'bank_account', 0, '', '', 0, 1);
print "<form method=\"post\" action=\"releve.php\">"; print "<form method=\"post\" action=\"releve.php\">";
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';

3
htdocs/compta/bank/transfer.php
View File

@ -152,6 +152,7 @@ if ($action == 'add')
*/ */
llxHeader(); llxHeader();
print ' <script type="text/javascript"> print ' <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$(".selectbankaccount").change(function() { $(".selectbankaccount").change(function() {
@ -228,7 +229,7 @@ if ($error)
$amount = GETPOST('amount', 'alpha'); $amount = GETPOST('amount', 'alpha');
} }
print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'title_bank.png'); print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'bank_account');
print $langs->trans("TransferDesc"); print $langs->trans("TransferDesc");
print "<br><br>"; print "<br><br>";

5
htdocs/compta/cashcontrol/class/cashcontrol.class.php
View File

@ -52,7 +52,8 @@ class CashControl extends CommonObject
/** /**
* @var string String with name of icon for pos_cash_fence. Must be the part after the 'object_' into object_pos_cash_fence.png * @var string String with name of icon for pos_cash_fence. Must be the part after the 'object_' into object_pos_cash_fence.png
*/ */
public $picto = 'account'; public $picto = 'cash-register';
public $fields=array( public $fields=array(
'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10), 'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
@ -372,7 +373,7 @@ class CashControl extends CommonObject
$newref=($this->ref?$this->ref:$this->id); $newref=($this->ref?$this->ref:$this->id);
$label = '<u>' . $langs->trans("ShowCashFence") . '</u>'; $label = '<u>' . $langs->trans("CashFence") . '</u>';
$label.= '<br>'; $label.= '<br>';
$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . ($this->ref?$this->ref:$this->id); $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . ($this->ref?$this->ref:$this->id);

3
htdocs/compta/paiement/cheque/card.php
View File

@ -306,13 +306,14 @@ $formfile = new FormFile($db);
if ($action == 'new') if ($action == 'new')
{ {
$head = array();
$h = 0; $h = 0;
$head[$h][0] = $_SERVER["PHP_SELF"].'?action=new'; $head[$h][0] = $_SERVER["PHP_SELF"].'?action=new';
$head[$h][1] = $langs->trans("MenuChequeDeposits"); $head[$h][1] = $langs->trans("MenuChequeDeposits");
$hselected = $h; $hselected = $h;
$h++; $h++;
print load_fiche_titre($langs->trans("Cheques")); print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
} }
else else
{ {

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

@ -46,7 +46,7 @@ $accountstatic=new Account($db);
llxHeader('', $langs->trans("ChequesArea")); llxHeader('', $langs->trans("ChequesArea"));
print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank'); print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank_account');
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';

2
htdocs/compta/paiement/cheque/list.php
View File

@ -139,7 +139,7 @@ if ($resql)
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="page" value="'.$page.'">';
print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', 0, $newcardbutton, '', $limit); print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
$moreforfilter = ''; $moreforfilter = '';

2
htdocs/core/boxes/box_task.php
View File

@ -124,7 +124,7 @@ class box_task extends ModeleBoxes
$boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n"; $boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
$selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject")); $selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
$boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue); $boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
$boxcontent .= '<button type="submit" class="button">'.$langs->trans("Refresh").'</button>'; $boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
$boxcontent .= '</form>'."\n"; $boxcontent .= '</form>'."\n";
$boxcontent .= '</div>'."\n"; $boxcontent .= '</div>'."\n";
if (! empty($conf->use_javascript_ajax)) { if (! empty($conf->use_javascript_ajax)) {

4
htdocs/core/class/html.form.class.php
View File

@ -6823,10 +6823,10 @@ class Form
$toprint = array(); $toprint = array();
foreach ($categories as $c) foreach ($categories as $c)
{ {
$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text $ways = $c->print_all_ways(' &gt;&gt; ', '', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
foreach ($ways as $way) foreach ($ways as $way)
{ {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>'; $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.$way.'</li>';
} }
} }
return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>'; return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

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

@ -3132,13 +3132,13 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
if (empty($srconly) && in_array($pictowithouttext, array( if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
'address', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h', 'address', 'bank_account', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
'filter', 'file-code', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'note', 'filter', 'file-code', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'note',
'object_action', 'object_account', 'object_barcode', 'object_phoning', 'object_phoning_fax', 'object_email', 'object_action', 'object_account', 'object_barcode', 'object_phoning', 'object_phoning_fax', 'object_email',
'object_bookmark', 'object_bug', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', 'object_bookmark', 'object_bug', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
'object_cash-register', 'object_holiday', 'object_hrm', 'object_accounting', 'object_category', 'object_multicurrency', 'object_cash-register', 'object_holiday', 'object_hrm', 'object_accounting', 'object_category', 'object_multicurrency',
'object_printer', 'object_resource', 'object_technic', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other', 'object_printer', 'object_resource', 'object_technic', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats', 'trip',
'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe', 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
@ -3160,8 +3160,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithouttext = str_replace('object_', '', $pictowithouttext); $pictowithouttext = str_replace('object_', '', $pictowithouttext);
$arrayconvpictotofa = array( $arrayconvpictotofa = array(
'action'=>'calendar-alt', 'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', 'account'=>'university', 'action'=>'calendar-alt', 'address'=> 'address-book', 'bank_account'=>'university',
'account'=>'university', 'accounting'=>'chart-line', 'category'=>'tag', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
'accounting'=>'chart-line', 'category'=>'tag',
'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt',
'email'=>'at', 'email'=>'at',
'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle', 'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',
@ -3173,7 +3174,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'multicurrency'=>'dollar-sign', 'other'=>'square', 'resource'=>'laptop-house', 'multicurrency'=>'dollar-sign', 'other'=>'square', 'resource'=>'laptop-house',
'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle', 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'technic'=>'cogs', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'technic'=>'cogs',
'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
'title_agenda'=>'calendar-alt',
'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'resize'=>'crop', 'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'resize'=>'crop',
'uparrow'=>'mail-forward', 'uparrow'=>'mail-forward',
'jabber'=>'comment-o' 'jabber'=>'comment-o'
@ -3224,10 +3226,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
// Add CSS // Add CSS
$arrayconvpictotomorcess = array( $arrayconvpictotomorcess = array(
'action'=>'bg-infoxbox-action', 'account'=>'bg-infoxbox-bank_account', 'multicurrency'=>'bg-infoxbox-bank_account', 'action'=>'bg-infoxbox-action', 'account'=>'bg-infoxbox-bank_account', 'bank_account'=>'bg-infoxbox-bank_account', 'cash-register'=>'bg-infoxbox-bank_account',
'check'=>'font-status4', 'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent', 'multicurrency'=>'bg-infoxbox-bank_account',
'check'=>'font-status4',
'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent',
'members'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent',
'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4', 'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
'holiday'=>'bg-infoxbox-holiday', 'resource'=>'bg-infoxbox-action', 'trip'=>'bg-infoxbox-expensereport', 'holiday'=>'bg-infoxbox-holiday', 'resource'=>'bg-infoxbox-action', 'title_hrm'=>'bg-infoxbox-holiday', 'trip'=>'bg-infoxbox-expensereport',
'title_agenda'=>'bg-infoxbox-action',
'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode' 'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
); );
if (! empty($arrayconvpictotomorcess[$pictowithouttext])) { if (! empty($arrayconvpictotomorcess[$pictowithouttext])) {
@ -3236,7 +3242,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
// Define $color // Define $color
$arrayconvpictotocolor = array( $arrayconvpictotocolor = array(
'category'=>'#666', 'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999', 'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
'other'=>'#ddd', 'other'=>'#ddd',
'playdisabled'=>'#ccc', 'printer'=>'#444', 'resize'=>'#444', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'resize'=>'#444',
'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>'' 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>''

4
htdocs/expensereport/card.php
View File

@ -1450,7 +1450,7 @@ $ecmfilesstatic = new EcmFiles($db);
// Create // Create
if ($action == 'create') if ($action == 'create')
{ {
print load_fiche_titre($langs->trans("NewTrip")); print load_fiche_titre($langs->trans("NewTrip"), '', 'trip');
print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="create">'; print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="create">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
@ -1574,7 +1574,7 @@ else
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous) if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
{ {
print load_fiche_titre($langs->trans('TripCard')); print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
print '<div class="tabBar">'; print '<div class="tabBar">';
print $langs->trans('NotUserRightToView'); print $langs->trans('NotUserRightToView');

2
htdocs/expensereport/index.php
View File

@ -110,7 +110,7 @@ if ($result)
} }
print load_fiche_titre($langs->trans("ExpensesArea")); print load_fiche_titre($langs->trans("ExpensesArea"), '', 'trip');
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';

2
htdocs/expensereport/list.php
View File

@ -477,7 +477,7 @@ if ($resql)
$newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expensereport/card.php?action=create'); $newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expensereport/card.php?action=create');
} }
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'trip', 0, $newcardbutton, '', $limit);
} }
$topicmail = "SendExpenseReport"; $topicmail = "SendExpenseReport";

2
htdocs/expensereport/stats/index.php
View File

@ -70,7 +70,7 @@ $dir = $conf->expensereport->dir_temp;
llxHeader('', $title); llxHeader('', $title);
print load_fiche_titre($title, $mesg); print load_fiche_titre($title, '', 'trip');
dol_mkdir($dir); dol_mkdir($dir);

2
htdocs/holiday/list.php
View File

@ -441,7 +441,7 @@ if ($resql)
$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request'); $newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request');
} }
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit);
} }
$topicmail = "Information"; $topicmail = "Information";

1
htdocs/langs/en_US/cashdesk.lang
View File

@ -49,6 +49,7 @@ Footer=Footer
AmountAtEndOfPeriod=Amount at end of period (day, month or year) AmountAtEndOfPeriod=Amount at end of period (day, month or year)
TheoricalAmount=Theorical amount TheoricalAmount=Theorical amount
RealAmount=Real amount RealAmount=Real amount
CashFence=Cash fence
CashFenceDone=Cash fence done for the period CashFenceDone=Cash fence done for the period
NbOfInvoices=Nb of invoices NbOfInvoices=Nb of invoices
Paymentnumpad=Type of Pad to enter payment Paymentnumpad=Type of Pad to enter payment

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

@ -115,7 +115,8 @@ a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; co
a:hover { text-decoration: underline; color: var(--colortextlink); } a:hover { text-decoration: underline; color: var(--colortextlink); }
a.commonlink { color: var(--colortextlink) !important; text-decoration: none; } a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; } th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
th.liste_titre_sel, td.liste_titre_sel, th.liste_titre, td.liste_titre { opacity: 0.9; } tr.liste_titre th.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre td.liste_titre_sel:not(.maxwidthsearch),
tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titre:not(.maxwidthsearch) { opacity: 0.8; }
/* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */ /* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select { input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
background-color: var(--inputbackgroundcolor); background-color: var(--inputbackgroundcolor);
@ -182,8 +183,8 @@ input, select {
border-collapse: collapse; border-collapse: collapse;
border: none; border: none;
} }
#mainbody input.buttongen { #mainbody input.buttongen, #mainbody button.buttongen {
padding: 4px 4px; padding: 3px 4px;
} }
input.button:focus { input.button:focus {
@ -1569,7 +1570,7 @@ div.nopadding {
td.nobordernopadding.widthpictotitle.opacityhigh.valignmiddle.col-picto { td.nobordernopadding.widthpictotitle.opacityhigh.valignmiddle.col-picto {
color: var(--colortexttitlenotab); color: var(--colortexttitlenotab);
opacity: 0.45; opacity: 0.6;
} }
.pictotitle { .pictotitle {
margin-<?php echo $right; ?>: 8px; margin-<?php echo $right; ?>: 8px;
@ -3823,7 +3824,7 @@ div.boximport {
.fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); } .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); }
.widthpictotitle { width: 32px; text-align: <?php echo $left; ?>; } .widthpictotitle { width: 32px; text-align: <?php echo $left; ?>; }
span.widthpictotitle { font-size: 2.1em; }; span.widthpictotitle { font-size: 2em; };
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
.dolgraphtitlecssboxes { /* margin: 0px; */ } .dolgraphtitlecssboxes { /* margin: 0px; */ }

2
htdocs/user/list.php
View File

@ -323,7 +323,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : '')); $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'generic', 0, $morehtmlright.' '.$newcardbutton, '', $limit); print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit);
if (!empty($catid)) if (!empty($catid))
{ {