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

Look and feel v20

Browse Source
This commit is contained in:
Laurent Destailleur
2024-04-01 15:04:20 +02:00
parent 3c65383533
commit e3037794aa
6 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/index.php
View File

@@ -422,6 +422,8 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
*/
if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "commande", "lire")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_order", "lire"))) {
$supplierorderstatic = new CommandeFournisseur($db);
$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ht, cf.total_tva, cf.total_ttc, cf.fk_statut as status";
$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
$sql .= ", s.code_client, s.code_compta, s.client";
@@ -639,7 +641,7 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
}
$num = $db->num_rows($resql);
startSimpleTable($langs->trans($header, min($max, $num)), "societe/list.php", "type=p,c", 1);
startSimpleTable($langs->trans($header, min($max, $num)), "societe/list.php", "type=p,c&sortfield=s.tms&sortorder=DESC", 1, -1, 'company');
if ($num) {
$i = 0;

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

@@ -12607,13 +12607,14 @@ function getNonce()
* @param string $header The first left header of the table (automatic translated)
* @param string $link (optional) The link to a internal dolibarr page, when click on the number (without the first "/")
* @param string $arguments (optional) Additional arguments for the link (e.g. "search_status=0")
* @param integer $emptyRows (optional) The count of empty rows after the first header
* @param integer $emptyRows (optional) The count of empty columns after the first column
* @param integer $number (optional) The number that is shown right after the first header, when not set the link is shown on the right side of the header as "FullList"
* @param string $pictofulllist (optional) The picto to use for the full list link
* @return void
*
* @see finishSimpleTable()
*/
function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0, $number = -1)
function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0, $number = -1, $pictofulllist = '')
{
global $langs;
@@ -12657,7 +12658,12 @@ function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0,
print '<a class="commonlink" href="'.DOL_URL_ROOT.'/'.$link.'">';
}
if ($pictofulllist) {
print img_picto($langs->trans("FullList"), $pictofulllist);
} else {
print $langs->trans("FullList");
}
print '</a>';
print '</th>';
}

10
htdocs/expensereport/index.php
View File

@@ -66,6 +66,8 @@ if (!$sortfield) {
}
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
/*
* View
@@ -190,8 +192,6 @@ print '</div>';
print '</div><div class="fichetwothirdright">';
$max = 10;
$langs->load("boxes");
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut as user_status, u.photo, u.email, u.admin,";
@@ -223,7 +223,11 @@ if ($result) {
print '<th class="right">'.$langs->trans("AmountHT").'</th>';
print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
print '<th>&nbsp;</th>';
print '<th>';
print '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?sortfield=d.tms&sortorder=DESC">';
print img_picto($langs->trans("FullList"), 'expensereport');
print '</a>';
print '</th>';
print '</tr>';
if ($num) {
$total_ttc = $totalam = $total = 0;

21
htdocs/hrm/index.php
View File

@@ -223,8 +223,13 @@ if (isModEnabled('holiday') && $user->hasRight('holiday', 'read')) {
print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
print '<th>'.$langs->trans("from").'</th>';
print '<th>'.$langs->trans("to").'</th>';
print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/holiday/list.php?sortfield=cp.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
print '<th></th>';
print '<th class="right">';
print '<a href="'.DOL_URL_ROOT.'/holiday/list.php?sortfield=cp.tms&sortorder=DESC">';
print img_picto($langs->trans("FullList"), 'holiday');
print '</th>';
print '</tr>';
if ($num) {
while ($i < $num && $i < $max) {
$obj = $db->fetch_object($result);
@@ -300,11 +305,13 @@ if (isModEnabled('expensereport') && $user->hasRight('expensereport', 'read')) {
print '<tr class="liste_titre">';
print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
print '<th class="right">'.$langs->trans("TotalTTC").'</th>';
print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/expensereport/list.php?sortfield=d.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
print '<th></th>';
print '<th class="right"><a href="'.DOL_URL_ROOT.'/expensereport/list.php?sortfield=d.tms&sortorder=DESC">';
print img_picto($langs->trans("FullList"), 'expensereport');
print '</th>';
print '</tr>';
if ($num) {
$total_ttc = $totalam = $total = 0;
if ($num) {
$expensereportstatic = new ExpenseReport($db);
$userstatic = new User($db);
while ($i < $num && $i < $max) {
@@ -377,7 +384,11 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
print '<th colspan="3">';
print $langs->trans("BoxTitleLatestModifiedCandidatures", min($max, $num));
print '</th>';
print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentcandidature_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
print '<th></th>';
print '<th class="right"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentcandidature_list.php?sortfield=t.tms&sortorder=DESC">';
print img_picto($langs->trans("FullList"), 'recruitmentcandidature');
//print $langs->trans("FullList");
print '</th>';
print '</tr>';
if ($num) {
while ($i < $num) {

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

@@ -514,7 +514,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
flex-grow : 1;
flex-shrink: 1;
flex-basis: auto;
width: 280px;
width: 290px;
}
.box-flex-item.filler {
height: 0;

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

@@ -567,7 +567,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
flex-shrink: 1;
flex-basis: auto;
width: 280px;
width: 290px;
margin: 5px 0px 0px 15px;
}
.box-flex-item.filler{
@@ -616,6 +616,3 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
max-width: calc(100% - 82px);
}
}