From 0d3c5bcfa8638436c8b8b78d7344f7d3aa39dd9e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 29 May 2017 06:35:53 +0200
Subject: [PATCH] Update documents & info page - better look & feel v6
---
htdocs/compta/salaries/card.php | 4 +--
htdocs/compta/salaries/document.php | 43 ++++++++++++++++-------------
htdocs/compta/salaries/info.php | 31 +++++++++++++++++----
3 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 63b5139ce29..68f59d03cfa 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -391,9 +391,9 @@ if ($id)
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
print '</table>';
-
+
print '</div>';
-
+
dol_fiche_end();
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 7b24a0762f3..03a69a764cf 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -6,7 +6,7 @@
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,7 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
$langs->load("other");
+$langs->load("users");
$langs->load("salaries");
+$langs->load('hrm');
$langs->load("companies");
$id = GETPOST('id','int');
@@ -83,7 +85,6 @@ $form = new Form($db);
llxHeader("",$langs->trans("SalaryPayment"));
-
if ($object->id)
{
$object->fetch_thirdparty();
@@ -92,7 +93,6 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), 0, 'payment');
-
// Construit liste des fichiers
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0;
@@ -101,29 +101,34 @@ if ($object->id)
$totalsize+=$file['size'];
}
+ $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+ $morehtmlref='<div class="refidno">';
+
+ $userstatic=new User($db);
+ $userstatic->fetch($object->fk_user);
- print '<table class="border" width="100%">';
+ $morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+ $morehtmlref.='</div>';
- $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
- // Ref
- print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
- print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
- print '</td></tr>';
+ print '<div class="fichecenter">';
+ print '<div class="underbanner clearboth"></div>';
- // Societe
- //print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+ print '<table class="border" width="100%">';
+ print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+ print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+ print '</table>';
- print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
- print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
- print '</table>';
+ print '</div>';
- print '</div>';
+ dol_fiche_end();
- $modulepart = 'salaries';
- $permission = $user->rights->salaries->write;
- $param = '&id=' . $object->id;
- include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+ $modulepart = 'salaries';
+ $permission = $user->rights->salaries->write;
+ $param = '&id=' . $object->id;
+ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
}
else
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index f15aac021ec..05dc7835b68 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2005-2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
+ * Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
+ * Copyright (C) 2017 Alexandre Spangaro <aspangaro@zendsi.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$langs->load("compta");
$langs->load("bills");
+$langs->load("users");
$langs->load("salaries");
+$langs->load('hrm');
$id=GETPOST('id','int');
$action=GETPOST('action','aZ09');
@@ -46,21 +49,37 @@ $result = restrictedArea($user, 'salaries', '', '', '');
llxHeader("",$langs->trans("SalaryPayment"));
-$salpayment = new PaymentSalary($db);
-$result = $salpayment->fetch($id);
-$salpayment->info($id);
+$object = new PaymentSalary($db);
+$object->fetch($id);
+$object->info($id);
-$head = salaries_prepare_head($salpayment);
+$head = salaries_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), 0, 'payment');
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+$morehtmlref='<div class="refidno">';
+
+$userstatic=new User($db);
+$userstatic->fetch($object->fk_user);
+
+$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
print '<table width="100%"><tr><td>';
-dol_print_object_info($salpayment);
+dol_print_object_info($object);
print '</td></tr></table>';
print '</div>';
+dol_fiche_end();
+
llxFooter();
$db->close();
--
GitLab