Add sorting for project overview columns
This commit is contained in:
Tobias Sekan
GitHub
parent
fe2c25a9a3
commit
a155409bc2
@ -6,6 +6,7 @@
|
||||
* Copyright (C) 2015-2019 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2016 Josep Lluís Amador <joseplluis@lliuretic.cat>
|
||||
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.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
|
||||
@ -34,58 +35,56 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
|
||||
if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
|
||||
if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
||||
if (!empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
|
||||
if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
|
||||
if (!empty($conf->supplier_proposal->enabled)) require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
|
||||
if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
|
||||
if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
|
||||
if (!empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
|
||||
if (!empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
|
||||
if (!empty($conf->expedition->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
|
||||
if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
|
||||
if (!empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
|
||||
if (!empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
|
||||
if (!empty($conf->don->enabled)) require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
|
||||
if (!empty($conf->loan->enabled)) require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
|
||||
if (!empty($conf->loan->enabled)) require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
|
||||
if (!empty($conf->stock->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
|
||||
if (!empty($conf->tax->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
|
||||
if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
|
||||
if (!empty($conf->salaries->enabled)) require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
|
||||
if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
|
||||
if (!empty($conf->mrp->enabled)) require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
|
||||
if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
|
||||
if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
||||
if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
|
||||
if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
|
||||
if (! empty($conf->supplier_proposal->enabled)) require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
|
||||
if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
|
||||
if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
|
||||
if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
|
||||
if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
|
||||
if (! empty($conf->expedition->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
|
||||
if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
|
||||
if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
|
||||
if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
|
||||
if (! empty($conf->don->enabled)) require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
|
||||
if (! empty($conf->loan->enabled)) require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
|
||||
if (! empty($conf->loan->enabled)) require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
|
||||
if (! empty($conf->stock->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
|
||||
if (! empty($conf->tax->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
|
||||
if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
|
||||
if (! empty($conf->salaries->enabled)) require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
|
||||
if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta'));
|
||||
if (!empty($conf->facture->enabled)) $langs->load("bills");
|
||||
if (!empty($conf->commande->enabled)) $langs->load("orders");
|
||||
if (!empty($conf->propal->enabled)) $langs->load("propal");
|
||||
if (!empty($conf->ficheinter->enabled)) $langs->load("interventions");
|
||||
if (!empty($conf->deplacement->enabled)) $langs->load("trips");
|
||||
if (!empty($conf->expensereport->enabled)) $langs->load("trips");
|
||||
if (!empty($conf->don->enabled)) $langs->load("donations");
|
||||
if (!empty($conf->loan->enabled)) $langs->load("loan");
|
||||
if (!empty($conf->salaries->enabled)) $langs->load("salaries");
|
||||
if (!empty($conf->mrp->enabled)) $langs->load("mrp");
|
||||
if (! empty($conf->facture->enabled)) $langs->load("bills");
|
||||
if (! empty($conf->commande->enabled)) $langs->load("orders");
|
||||
if (! empty($conf->propal->enabled)) $langs->load("propal");
|
||||
if (! empty($conf->ficheinter->enabled)) $langs->load("interventions");
|
||||
if (! empty($conf->deplacement->enabled)) $langs->load("trips");
|
||||
if (! empty($conf->expensereport->enabled)) $langs->load("trips");
|
||||
if (! empty($conf->don->enabled)) $langs->load("donations");
|
||||
if (! empty($conf->loan->enabled)) $langs->load("loan");
|
||||
if (! empty($conf->salaries->enabled)) $langs->load("salaries");
|
||||
|
||||
$id = GETPOST('id', 'int');
|
||||
$ref = GETPOST('ref', 'alpha');
|
||||
$action = GETPOST('action', 'alpha');
|
||||
$datesrfc = GETPOST('datesrfc');
|
||||
$dateerfc = GETPOST('dateerfc');
|
||||
$dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
|
||||
$datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
|
||||
if (empty($dates) && !empty($datesrfc)) $dates = dol_stringtotime($datesrfc);
|
||||
if (empty($datee) && !empty($dateerfc)) $datee = dol_stringtotime($dateerfc);
|
||||
if (!isset($_POST['datesrfc']) && !isset($_POST['datesday']) && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR))
|
||||
$id=GETPOST('id', 'int');
|
||||
$ref=GETPOST('ref', 'alpha');
|
||||
$action=GETPOST('action', 'alpha');
|
||||
$datesrfc=GETPOST('datesrfc');
|
||||
$dateerfc=GETPOST('dateerfc');
|
||||
$dates=dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
|
||||
$datee=dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
|
||||
if (empty($dates) && ! empty($datesrfc)) $dates=dol_stringtotime($datesrfc);
|
||||
if (empty($datee) && ! empty($dateerfc)) $datee=dol_stringtotime($dateerfc);
|
||||
if (! isset($_POST['datesrfc']) && ! isset($_POST['datesday']) && ! empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR))
|
||||
{
|
||||
$new = dol_now();
|
||||
$tmp = dol_getdate($new);
|
||||
$new=dol_now();
|
||||
$tmp=dol_getdate($new);
|
||||
//$datee=$now
|
||||
//$dates=dol_time_plus_duree($datee, -1, 'y');
|
||||
$dates = dol_get_first_day($tmp['year'], 1);
|
||||
$dates=dol_get_first_day($tmp['year'], 1);
|
||||
}
|
||||
if ($id == '' && $ref == '')
|
||||
{
|
||||
@ -94,16 +93,16 @@ if ($id == '' && $ref == '')
|
||||
exit();
|
||||
}
|
||||
|
||||
$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
|
||||
$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
|
||||
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
|
||||
|
||||
$object = new Project($db);
|
||||
|
||||
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
|
||||
if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
|
||||
if(! empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
|
||||
|
||||
// Security check
|
||||
$socid = $object->socid;
|
||||
$socid=$object->socid;
|
||||
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
|
||||
$result = restrictedArea($user, 'projet', $object->id, 'projet&project');
|
||||
|
||||
@ -167,23 +166,23 @@ print '<tr><td class="tdtop">';
|
||||
print $langs->trans("Usage");
|
||||
print '</td>';
|
||||
print '<td>';
|
||||
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
|
||||
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
|
||||
{
|
||||
print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
|
||||
print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha')!=''?' checked="checked"':'') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
|
||||
$htmltext = $langs->trans("ProjectFollowOpportunity");
|
||||
print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
|
||||
print '<br>';
|
||||
}
|
||||
if (empty($conf->global->PROJECT_HIDE_TASKS))
|
||||
{
|
||||
print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
|
||||
print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha')!=''?' checked="checked"':'') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
|
||||
$htmltext = $langs->trans("ProjectFollowTasks");
|
||||
print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
|
||||
print '<br>';
|
||||
}
|
||||
if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
|
||||
if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
|
||||
{
|
||||
print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
|
||||
print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha')!=''?' checked="checked"':'') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
|
||||
$htmltext = $langs->trans("ProjectBillTimeDescription");
|
||||
print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
|
||||
print '<br>';
|
||||
@ -251,7 +250,7 @@ print '</td></tr>';
|
||||
// Categories
|
||||
if ($conf->categorie->enabled) {
|
||||
print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
|
||||
print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
|
||||
print $form->showCategories($object->id, 'project', 1);
|
||||
print "</td></tr>";
|
||||
}
|
||||
|
||||
@ -386,18 +385,6 @@ $listofreferent = array(
|
||||
'buttonnew'=>'CreateShipment',
|
||||
'testnew'=>0,
|
||||
'test'=>$conf->expedition->enabled && $user->rights->expedition->lire),
|
||||
'mrp'=>array(
|
||||
'name'=>"MO",
|
||||
'title'=>"ListMOAssociatedProject",
|
||||
'class'=>'Mo',
|
||||
'table'=>'mrp_mo',
|
||||
'datefieldname'=>'date_valid',
|
||||
'urlnew'=>DOL_URL_ROOT.'/mrp/mo_card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
|
||||
'lang'=>'mrp',
|
||||
'buttonnew'=>'CreateMO',
|
||||
'testnew'=>'$user->rights->mrp->write',
|
||||
'project_field'=>'fk_project',
|
||||
'test'=>$conf->mrp->enabled && $user->rights->mrp->read),
|
||||
'trip'=>array(
|
||||
'name'=>"TripsAndExpenses",
|
||||
'title'=>"ListExpenseReportsAssociatedProject",
|
||||
@ -526,19 +513,19 @@ $listofreferent = array(
|
||||
*/
|
||||
);
|
||||
|
||||
$parameters = array('listofreferent'=>$listofreferent);
|
||||
$parameters=array('listofreferent'=>$listofreferent);
|
||||
$resHook = $hookmanager->executeHooks('completeListOfReferent', $parameters, $object, $action);
|
||||
|
||||
if (!empty($hookmanager->resArray)) {
|
||||
if(!empty($hookmanager->resArray)) {
|
||||
$listofreferent = array_merge($listofreferent, $hookmanager->resArray);
|
||||
}
|
||||
|
||||
if ($action == "addelement")
|
||||
if ($action=="addelement")
|
||||
{
|
||||
$tablename = GETPOST("tablename");
|
||||
$elementselectid = GETPOST("elementselect");
|
||||
$result = $object->update_element($tablename, $elementselectid);
|
||||
if ($result < 0)
|
||||
$result=$object->update_element($tablename, $elementselectid);
|
||||
if ($result<0)
|
||||
{
|
||||
setEventMessages($object->error, $object->errors, 'errors');
|
||||
}
|
||||
@ -565,7 +552,7 @@ $showdatefilter = 0;
|
||||
if (!$showdatefilter)
|
||||
{
|
||||
print '<div class="center centpercent">';
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'?id=' . $object->id . '" method="post">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION["newtoken"].'">';
|
||||
print '<input type="hidden" name="tablename" value="'.$tablename.'">';
|
||||
print '<input type="hidden" name="action" value="view">';
|
||||
@ -606,53 +593,53 @@ print '</tr>';
|
||||
|
||||
foreach ($listofreferent as $key => $value)
|
||||
{
|
||||
$name = $langs->trans($value['name']);
|
||||
$title = $value['title'];
|
||||
$classname = $value['class'];
|
||||
$tablename = $value['table'];
|
||||
$datefieldname = $value['datefieldname'];
|
||||
$qualified = $value['test'];
|
||||
$name=$langs->trans($value['name']);
|
||||
$title=$value['title'];
|
||||
$classname=$value['class'];
|
||||
$tablename=$value['table'];
|
||||
$datefieldname=$value['datefieldname'];
|
||||
$qualified=$value['test'];
|
||||
$margin = $value['margin'];
|
||||
$project_field = $value['project_field'];
|
||||
if ($qualified && isset($margin)) // If this element must be included into profit calculation ($margin is 'minus' or 'plus')
|
||||
{
|
||||
$element = new $classname($db);
|
||||
|
||||
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
|
||||
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field)?$project_field:'fk_projet');
|
||||
|
||||
if (is_array($elementarray) && count($elementarray) > 0)
|
||||
if (count($elementarray)>0 && is_array($elementarray))
|
||||
{
|
||||
$total_ht = 0;
|
||||
$total_ttc = 0;
|
||||
|
||||
$num = count($elementarray);
|
||||
$num=count($elementarray);
|
||||
for ($i = 0; $i < $num; $i++)
|
||||
{
|
||||
$tmp = explode('_', $elementarray[$i]);
|
||||
$idofelement = $tmp[0];
|
||||
$idofelementuser = $tmp[1];
|
||||
$tmp=explode('_', $elementarray[$i]);
|
||||
$idofelement=$tmp[0];
|
||||
$idofelementuser=$tmp[1];
|
||||
|
||||
$element->fetch($idofelement);
|
||||
if ($idofelementuser) $elementuser->fetch($idofelementuser);
|
||||
|
||||
// Define if record must be used for total or not
|
||||
$qualifiedfortotal = true;
|
||||
$qualifiedfortotal=true;
|
||||
if ($key == 'invoice')
|
||||
{
|
||||
if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
|
||||
if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
|
||||
if (! empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal=false; // Replacement invoice, do not include into total
|
||||
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal=false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
|
||||
}
|
||||
if ($key == 'propal')
|
||||
{
|
||||
if ($element->statut == Propal::STATUS_NOTSIGNED) $qualifiedfortotal = false; // Refused proposal must not be included in total
|
||||
if ($element->statut == Propal::STATUS_NOTSIGNED) $qualifiedfortotal=false; // Refused proposal must not be included in total
|
||||
}
|
||||
|
||||
if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
|
||||
|
||||
// Define $total_ht_by_line
|
||||
if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line = $element->amount;
|
||||
elseif ($tablename == 'fichinter') $total_ht_by_line = $element->getAmount();
|
||||
elseif ($tablename == 'stock_mouvement') $total_ht_by_line = $element->price * abs($element->qty);
|
||||
if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line=$element->amount;
|
||||
elseif ($tablename == 'fichinter') $total_ht_by_line=$element->getAmount();
|
||||
elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
|
||||
elseif ($tablename == 'projet_task')
|
||||
{
|
||||
if ($idofelementuser)
|
||||
@ -666,25 +653,25 @@ foreach ($listofreferent as $key => $value)
|
||||
$total_ht_by_line = price2num($tmp['amount'], 'MT');
|
||||
}
|
||||
}
|
||||
elseif ($key == 'loan') {
|
||||
if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
|
||||
elseif ($key == 'loan'){
|
||||
if((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)){
|
||||
// Get total loan
|
||||
$total_ht_by_line = -$element->capital;
|
||||
}
|
||||
else {
|
||||
else{
|
||||
// Get loan schedule according to date filter
|
||||
$total_ht_by_line = 0;
|
||||
$loanScheduleStatic = new LoanSchedule($element->db);
|
||||
$loanScheduleStatic->fetchAll($element->id);
|
||||
if (!empty($loanScheduleStatic->lines)) {
|
||||
foreach ($loanScheduleStatic->lines as $loanSchedule) {
|
||||
if(!empty($loanScheduleStatic->lines)){
|
||||
foreach($loanScheduleStatic->lines as $loanSchedule){
|
||||
/**
|
||||
* @var $loanSchedule LoanSchedule
|
||||
*/
|
||||
if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
|
||||
if( ($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
|
||||
|| !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
|
||||
|| empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
|
||||
) {
|
||||
){
|
||||
$total_ht_by_line = -$loanSchedule->amount_capital;
|
||||
}
|
||||
}
|
||||
@ -702,7 +689,7 @@ foreach ($listofreferent as $key => $value)
|
||||
$defaultvat = get_default_tva($mysoc, $mysoc);
|
||||
$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
|
||||
}
|
||||
elseif ($key == 'loan') {
|
||||
elseif ($key == 'loan'){
|
||||
$total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
|
||||
}
|
||||
else $total_ttc_by_line = $element->total_ttc;
|
||||
@ -775,7 +762,12 @@ print "</table>";
|
||||
print '<br><br>';
|
||||
print '<br>';
|
||||
|
||||
|
||||
// TODO: FOR TESTING
|
||||
$param = 'id='.$object->id.'&mainmenu=home';
|
||||
$sortfield = GETPOST("sortfield", "alpha");
|
||||
$sortorder = GETPOST("sortorder", 'alpha');
|
||||
if (!$sortfield) $sortfield = "nature";
|
||||
if (!$sortorder) $sortorder = "asc";
|
||||
|
||||
// Detail
|
||||
foreach ($listofreferent as $key => $value)
|
||||
@ -803,98 +795,102 @@ foreach ($listofreferent as $key => $value)
|
||||
|
||||
$element = new $classname($db);
|
||||
|
||||
$addform = '';
|
||||
$addform='';
|
||||
|
||||
$idtofilterthirdparty = 0;
|
||||
$idtofilterthirdparty=0;
|
||||
$array_of_element_linkable_with_different_thirdparty = array('facture_fourn', 'commande_fournisseur');
|
||||
if (!in_array($tablename, $array_of_element_linkable_with_different_thirdparty))
|
||||
if (! in_array($tablename, $array_of_element_linkable_with_different_thirdparty))
|
||||
{
|
||||
$idtofilterthirdparty = $object->thirdparty->id;
|
||||
if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
|
||||
$idtofilterthirdparty=$object->thirdparty->id;
|
||||
if (! empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty.=','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
|
||||
}
|
||||
|
||||
if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element))
|
||||
{
|
||||
$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300', -2, !empty($project_field) ? $project_field : 'fk_projet');
|
||||
if ($selectList < 0)
|
||||
$selectList=$formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300', -2, !empty($project_field)?$project_field:'fk_projet');
|
||||
if ($selectList<0)
|
||||
{
|
||||
setEventMessages($formproject->error, $formproject->errors, 'errors');
|
||||
}
|
||||
elseif ($selectList)
|
||||
elseif($selectList)
|
||||
{
|
||||
// Define form with the combo list of elements to link
|
||||
$addform .= '<div class="inline-block valignmiddle">';
|
||||
$addform .= '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
|
||||
$addform .= '<input type="hidden" name="token" value="'.$_SESSION["newtoken"].'">';
|
||||
$addform .= '<input type="hidden" name="tablename" value="'.$tablename.'">';
|
||||
$addform .= '<input type="hidden" name="action" value="addelement">';
|
||||
$addform .= '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">';
|
||||
$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
|
||||
$addform .= '<table><tr><td>'.$langs->trans("SelectElement").'</td>';
|
||||
$addform .= '<td>'.$selectList.'</td>';
|
||||
$addform .= '<td><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("AddElement")).'"></td>';
|
||||
$addform .= '</tr></table>';
|
||||
$addform .= '</form>';
|
||||
$addform .= '</div>';
|
||||
$addform.='<div class="inline-block valignmiddle">';
|
||||
$addform.='<form action="'.$_SERVER["PHP_SELF"].'?id=' . $object->id . '" method="post">';
|
||||
$addform.='<input type="hidden" name="token" value="'.$_SESSION["newtoken"].'">';
|
||||
$addform.='<input type="hidden" name="tablename" value="'.$tablename.'">';
|
||||
$addform.='<input type="hidden" name="action" value="addelement">';
|
||||
$addform.='<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">';
|
||||
$addform.='<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
|
||||
$addform.='<table><tr><td>'.$langs->trans("SelectElement").'</td>';
|
||||
$addform.='<td>'.$selectList.'</td>';
|
||||
$addform.='<td><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("AddElement")).'"></td>';
|
||||
$addform.='</tr></table>';
|
||||
$addform.='</form>';
|
||||
$addform.='</div>';
|
||||
}
|
||||
}
|
||||
if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew)
|
||||
{
|
||||
$addform .= '<div class="inline-block valignmiddle">';
|
||||
if ($testnew) $addform .= '<a class="buttonxxx" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
|
||||
$addform.='<div class="inline-block valignmiddle">';
|
||||
if ($testnew) $addform.='<a class="buttonxxx" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle">'.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
|
||||
elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
|
||||
$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
|
||||
$addform.='<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle">'.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
|
||||
}
|
||||
$addform .= '<div>';
|
||||
$addform.='<div>';
|
||||
}
|
||||
|
||||
print load_fiche_titre($langs->trans($title), $addform, '');
|
||||
|
||||
// Text for line : Date
|
||||
if (in_array($tablename, array('projet_task'))) $label_date = $langs->trans("TimeSpent");
|
||||
if (!in_array($tablename, array('projet_task'))) $label_date = $langs->trans("Date");
|
||||
|
||||
// Text for line : Thirdparty or user
|
||||
if (in_array($tablename, array('projet_task')) && $key == 'project_task') $label_user = ''; // if $key == 'project_task', we don't want details per user
|
||||
elseif (in_array($tablename, array('payment_various'))) $label_user = ''; // if $key == 'payment_various', we don't have any thirdparty
|
||||
elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) $label_user = $langs->trans("User");
|
||||
else $label_user = $langs->trans("ThirdParty");
|
||||
|
||||
// Text for line : Amount HT
|
||||
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
|
||||
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>';
|
||||
if ($key == 'loan') $label_amount_ht = $langs->trans("LoanCapital").'</td>';
|
||||
elseif (empty($value['disableamount'])) $label_amount_ht = $langs->trans("AmountHT");
|
||||
else $label_amount_ht = '';
|
||||
|
||||
// Text for line : Amount TTC
|
||||
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
|
||||
if ($key == 'loan') $label_amount_ttc = $langs->trans("RemainderToPay");
|
||||
elseif (empty($value['disableamount'])) $label_amount_ttc = $langs->trans("AmountTTC");
|
||||
else $label_amount_ttc = '';
|
||||
|
||||
// Text for line : Status
|
||||
if (in_array($tablename, array('projet_task'))) $label_status = $langs->trans("ProgressDeclared");
|
||||
else $label_status = $langs->trans("Status");
|
||||
|
||||
print "\n".'<!-- Table for tablename = '.$tablename.' -->'."\n";
|
||||
print '<table class="noborder centpercent">';
|
||||
|
||||
$moreattrib = ($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '';
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
|
||||
// Remove link column
|
||||
print '<td style="width: 24px"></td>';
|
||||
// Ref
|
||||
print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '').'>'.$langs->trans("Ref").'</td>';
|
||||
// Date
|
||||
print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '').' class="center">';
|
||||
if (in_array($tablename, array('projet_task'))) print $langs->trans("TimeSpent");
|
||||
if (!in_array($tablename, array('projet_task'))) print $langs->trans("Date");
|
||||
print '</td>';
|
||||
// Thirdparty or user
|
||||
print '<td>';
|
||||
if (in_array($tablename, array('projet_task')) && $key == 'project_task') print ''; // if $key == 'project_task', we don't want details per user
|
||||
elseif (in_array($tablename, array('payment_various'))) print ''; // if $key == 'payment_various', we don't have any thirdparty
|
||||
elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) print $langs->trans("User");
|
||||
else print $langs->trans("ThirdParty");
|
||||
print '</td>';
|
||||
// Duration of intervention
|
||||
if ($tablename == 'fichinter')
|
||||
{
|
||||
print '<td>';
|
||||
print $langs->trans("TotalDuration");
|
||||
$total_duration = 0;
|
||||
print '</td>';
|
||||
}
|
||||
// Amount HT
|
||||
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
|
||||
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>';
|
||||
if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
|
||||
elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
|
||||
else print '<td width="120"></td>';
|
||||
// Amount TTC
|
||||
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
|
||||
if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
|
||||
elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
|
||||
else print '<td width="120"></td>';
|
||||
// Status
|
||||
if (in_array($tablename, array('projet_task'))) print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>';
|
||||
else print '<td class="right" width="200">'.$langs->trans("Status").'</td>';
|
||||
|
||||
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "ref", "", $param, 'style="width: 200px"', $sortfield, $sortorder);
|
||||
print_liste_field_titre($label_date, $_SERVER["PHP_SELF"], "date", "", $param, $moreattrib, $sortfield, $sortorder, "center ");
|
||||
print_liste_field_titre($label_user, $_SERVER["PHP_SELF"], "user", "", $param, "", $sortfield, $sortorder);
|
||||
print_liste_field_titre($label_amount_ht, $_SERVER["PHP_SELF"], "amount_ht", "", $param, 'style="width: 120px"', $sortfield, $sortorder, "right ");
|
||||
print_liste_field_titre($label_amount_ttc, $_SERVER["PHP_SELF"], "amount_ttc", "", $param, 'style="width: 120px"', $sortfield, $sortorder, "right ");
|
||||
print_liste_field_titre($label_status, $_SERVER["PHP_SELF"], "status", "", $param, 'style="width: 200px"', $sortfield, $sortorder, "right ");
|
||||
|
||||
print '</tr>';
|
||||
|
||||
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
|
||||
$list = array();
|
||||
|
||||
if (is_array($elementarray) && count($elementarray) > 0)
|
||||
{
|
||||
$total_ht = 0;
|
||||
@ -915,6 +911,7 @@ foreach ($listofreferent as $key => $value)
|
||||
$num = count($elementarray);
|
||||
for ($i = 0; $i < $num; $i++)
|
||||
{
|
||||
$tablerow = new TableRow();
|
||||
$tmp = explode('_', $elementarray[$i]);
|
||||
$idofelement = $tmp[0];
|
||||
$idofelementuser = $tmp[1];
|
||||
@ -953,40 +950,31 @@ foreach ($listofreferent as $key => $value)
|
||||
if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
|
||||
}
|
||||
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
// Remove link
|
||||
print '<td style="width: 24px">';
|
||||
if ($tablename != 'projet_task' && $tablename != 'stock_mouvement')
|
||||
{
|
||||
if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) // PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
|
||||
{
|
||||
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unlink&tablename='.$tablename.'&elementselect='.$element->id.($project_field ? '&projectfield='.$project_field : '').'" class="reposition">';
|
||||
print img_picto($langs->trans('Unlink'), 'unlink');
|
||||
print '</a>';
|
||||
}
|
||||
}
|
||||
print "</td>\n";
|
||||
|
||||
// Ref
|
||||
print '<td class="left nowrap">';
|
||||
if ($tablename == 'expensereport_det')
|
||||
{
|
||||
print $expensereport->getNomUrl(1);
|
||||
$tablerow->ref = $expensereport->ref;
|
||||
$tablerow->ref_text = $expensereport->getNomUrl(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
$tablerow->ref = $element->ref;
|
||||
|
||||
// Show ref with link
|
||||
if ($element instanceof Task)
|
||||
{
|
||||
print $element->getNomUrl(1, 'withproject', 'time');
|
||||
print ' - '.dol_trunc($element->label, 48);
|
||||
$tablerow->ref_text = $element->getNomUrl(1, 'withproject', 'time');
|
||||
$tablerow->ref_text .= ' - '.dol_trunc($element->label, 48);
|
||||
}
|
||||
elseif ($key == 'loan') {
|
||||
print $element->getNomUrl(1);
|
||||
print ' - '.dol_trunc($element->label, 48);
|
||||
elseif ($key == 'loan')
|
||||
{
|
||||
$tablerow->ref_text = $element->getNomUrl(1);
|
||||
$tablerow->ref_text .= ' - '.dol_trunc($element->label, 48);
|
||||
}
|
||||
else
|
||||
{
|
||||
$tablerow->ref_text = $element->getNomUrl(1);
|
||||
}
|
||||
else print $element->getNomUrl(1);
|
||||
|
||||
$element_doc = $element->element;
|
||||
$filename = dol_sanitizeFileName($element->ref);
|
||||
@ -1002,14 +990,19 @@ foreach ($listofreferent as $key => $value)
|
||||
$filedir = $conf->fournisseur->facture->multidir_output[$element->entity].'/'.get_exdir($element->id, 2, 0, 0, $element, 'invoice_supplier').dol_sanitizeFileName($element->ref);
|
||||
}
|
||||
|
||||
print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
|
||||
$tablerow->ref_text .= '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
|
||||
|
||||
// Show supplier ref
|
||||
if (!empty($element->ref_supplier)) print ' - '.$element->ref_supplier;
|
||||
// Show customer ref
|
||||
if (!empty($element->ref_customer)) print ' - '.$element->ref_customer;
|
||||
if (!empty($element->ref_supplier))
|
||||
{
|
||||
$tablerow->ref_text .= ' - '.$element->ref_supplier;
|
||||
}
|
||||
// Show customer ref
|
||||
if (!empty($element->ref_customer))
|
||||
{
|
||||
$tablerow->ref_text .= ' - '.$element->ref_customer;
|
||||
}
|
||||
}
|
||||
print "</td>\n";
|
||||
|
||||
// Date or TimeSpent
|
||||
$date = ''; $total_time_by_line = null;
|
||||
@ -1033,46 +1026,53 @@ foreach ($listofreferent as $key => $value)
|
||||
$date = $element->date; // invoice, ...
|
||||
if (empty($date)) $date = $element->date_contrat;
|
||||
if (empty($date)) $date = $element->datev;
|
||||
if (empty($date) && !empty($datefieldname)) {
|
||||
$date = $element->$datefieldname;
|
||||
}
|
||||
}
|
||||
}
|
||||
elseif ($key == 'loan') {
|
||||
elseif ($key == 'loan')
|
||||
{
|
||||
$date = $element->datestart;
|
||||
}
|
||||
|
||||
print '<td class="center">';
|
||||
$tablerow->date = $date;
|
||||
|
||||
if ($tablename == 'actioncomm')
|
||||
{
|
||||
print dol_print_date($element->datep, 'dayhour');
|
||||
if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
|
||||
$tablerow->date_text = dol_print_date($element->datep, 'dayhour');
|
||||
|
||||
if ($element->datef && $element->datef > $element->datep)
|
||||
{
|
||||
$tablerow->date_text .= " - ".dol_print_date($element->datef, 'dayhour');
|
||||
}
|
||||
}
|
||||
elseif (in_array($tablename, array('projet_task')))
|
||||
{
|
||||
$tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
|
||||
print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
|
||||
print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
|
||||
print '</a>';
|
||||
$tablerow->date_text = '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
|
||||
$tablerow->date_text .= convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
|
||||
$tablerow->date_text .= '</a>';
|
||||
$total_time_by_line = $tmpprojtime['nbseconds'];
|
||||
}
|
||||
else print dol_print_date($date, 'day');
|
||||
print '</td>';
|
||||
else
|
||||
{
|
||||
$tablerow->date_text = dol_print_date($date, 'day');
|
||||
}
|
||||
|
||||
// Third party or user
|
||||
print '<td class="left">';
|
||||
if (is_object($element->thirdparty)) {
|
||||
print $element->thirdparty->getNomUrl(1, '', 48);
|
||||
} elseif ($tablename == 'expensereport_det') {
|
||||
if (is_object($element->thirdparty))
|
||||
{
|
||||
$tablerow->user = $element->thirdparty;
|
||||
}
|
||||
elseif ($tablename == 'expensereport_det')
|
||||
{
|
||||
$tmpuser = new User($db);
|
||||
$tmpuser->fetch($expensereport->fk_user_author);
|
||||
print $tmpuser->getNomUrl(1, '', 48);
|
||||
$tablerow->user = $tmpuser;
|
||||
}
|
||||
elseif ($tablename == 'payment_salary')
|
||||
{
|
||||
$tmpuser = new User($db);
|
||||
$tmpuser->fetch($element->fk_user);
|
||||
print $tmpuser->getNomUrl(1, '', 48);
|
||||
$tablerow->user = $tmpuser;
|
||||
}
|
||||
elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
|
||||
{
|
||||
@ -1080,22 +1080,12 @@ foreach ($listofreferent as $key => $value)
|
||||
{
|
||||
$tmpuser2 = new User($db);
|
||||
$tmpuser2->fetch($element->fk_user_author);
|
||||
print $tmpuser2->getNomUrl(1, '', 48);
|
||||
$tablerow->user = $tmpuser2;
|
||||
}
|
||||
}
|
||||
elseif ($tablename == 'projet_task' && $key == 'project_task_time') // if $key == 'project_task', we don't want details per user
|
||||
{
|
||||
print $elementuser->getNomUrl(1);
|
||||
}
|
||||
print '</td>';
|
||||
|
||||
// Add duration and store it in counter for fichinter
|
||||
if ($tablename == 'fichinter')
|
||||
{
|
||||
print '<td>';
|
||||
print convertSecondToTime($element->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
|
||||
$total_duration += $element->duration;
|
||||
print '</td>';
|
||||
$tablerow->user = $elementuser;
|
||||
}
|
||||
|
||||
// Amount without tax
|
||||
@ -1124,7 +1114,10 @@ foreach ($listofreferent as $key => $value)
|
||||
$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
|
||||
}
|
||||
}
|
||||
elseif ($key == 'loan') $total_ht_by_line = $element->capital;
|
||||
elseif ($key == 'loan')
|
||||
{
|
||||
$total_ht_by_line = $element->capital;
|
||||
}
|
||||
else
|
||||
{
|
||||
$total_ht_by_line = $element->total_ht;
|
||||
@ -1139,18 +1132,33 @@ foreach ($listofreferent as $key => $value)
|
||||
}
|
||||
}
|
||||
|
||||
print '<td class="right">';
|
||||
if ($othermessage) print $othermessage;
|
||||
$tablerow->amount_ht = $total_ht_by_line;
|
||||
|
||||
if ($othermessage)
|
||||
{
|
||||
$tablerow->amount_ht_text .= $othermessage;
|
||||
}
|
||||
|
||||
if (isset($total_ht_by_line))
|
||||
{
|
||||
if (!$qualifiedfortotal) print '<strike>';
|
||||
print price($total_ht_by_line);
|
||||
if (!$qualifiedfortotal) print '</strike>';
|
||||
if (! $qualifiedfortotal)
|
||||
{
|
||||
$tablerow->amount_ht_text .= '<strike>';
|
||||
}
|
||||
|
||||
$tablerow->amount_ht_text .= price($total_ht_by_line);
|
||||
|
||||
if (! $qualifiedfortotal)
|
||||
{
|
||||
$tablerow->amount_ht_text .= '</strike>';
|
||||
}
|
||||
}
|
||||
|
||||
if ($warning)
|
||||
{
|
||||
$tablerow->amount_ht_text .= ' '.img_warning($warning);
|
||||
}
|
||||
if ($warning) print ' '.img_warning($warning);
|
||||
print '</td>';
|
||||
}
|
||||
else print '<td></td>';
|
||||
|
||||
// Amount inc tax
|
||||
if (empty($value['disableamount']))
|
||||
@ -1172,7 +1180,10 @@ foreach ($listofreferent as $key => $value)
|
||||
$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
|
||||
}
|
||||
}
|
||||
elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
|
||||
elseif ($key == 'loan')
|
||||
{
|
||||
$total_ttc_by_line = $element->capital - $element->getSumPayment();
|
||||
}
|
||||
else
|
||||
{
|
||||
$total_ttc_by_line = $element->total_ttc;
|
||||
@ -1187,48 +1198,59 @@ foreach ($listofreferent as $key => $value)
|
||||
}
|
||||
}
|
||||
|
||||
print '<td class="right">';
|
||||
if ($othermessage) print $othermessage;
|
||||
$tablerow->amount_ttc = $total_ttc_by_line;
|
||||
|
||||
if ($othermessage)
|
||||
{
|
||||
$tablerow->amount_ttc_text .= $othermessage;
|
||||
}
|
||||
|
||||
if (isset($total_ttc_by_line))
|
||||
{
|
||||
if (!$qualifiedfortotal) print '<strike>';
|
||||
print price($total_ttc_by_line);
|
||||
if (!$qualifiedfortotal) print '</strike>';
|
||||
if (! $qualifiedfortotal)
|
||||
{
|
||||
$tablerow->amount_ttc_text .= '<strike>';
|
||||
}
|
||||
|
||||
$tablerow->amount_ttc_text .= price($total_ttc_by_line);
|
||||
|
||||
if (! $qualifiedfortotal)
|
||||
{
|
||||
$tablerow->amount_ttc_text .= '</strike>';
|
||||
}
|
||||
}
|
||||
|
||||
if ($warning)
|
||||
{
|
||||
$tablerow->amount_ttc_text .= ' '.img_warning($warning);
|
||||
}
|
||||
if ($warning) print ' '.img_warning($warning);
|
||||
print '</td>';
|
||||
}
|
||||
else print '<td></td>';
|
||||
|
||||
// Status
|
||||
print '<td class="right">';
|
||||
if ($tablename == 'expensereport_det')
|
||||
{
|
||||
print $expensereport->getLibStatut(5);
|
||||
$tablerow->status = $expensereport->getLibStatut(5);
|
||||
}
|
||||
elseif ($element instanceof CommonInvoice)
|
||||
{
|
||||
//This applies for Facture and FactureFournisseur
|
||||
print $element->getLibStatut(5, $element->getSommePaiement());
|
||||
$tablerow->status = $element->getLibStatut(5, $element->getSommePaiement());
|
||||
}
|
||||
elseif ($element instanceof Task)
|
||||
{
|
||||
if ($element->progress != '')
|
||||
{
|
||||
print $element->progress.' %';
|
||||
$tablerow->status = $element->progress.' %';
|
||||
}
|
||||
}
|
||||
elseif ($tablename == 'stock_mouvement')
|
||||
{
|
||||
print $element->getLibStatut(3);
|
||||
$tablerow->status = $element->getLibStatut(3);
|
||||
}
|
||||
else
|
||||
{
|
||||
print $element->getLibStatut(5);
|
||||
$tablerow->status = $element->getLibStatut(5);
|
||||
}
|
||||
print '</td>';
|
||||
|
||||
print '</tr>';
|
||||
|
||||
if ($qualifiedfortotal)
|
||||
{
|
||||
@ -1241,6 +1263,53 @@ foreach ($listofreferent as $key => $value)
|
||||
$total_time = $total_time + $total_time_by_line;
|
||||
}
|
||||
|
||||
$sortable_table[] = $tablerow;
|
||||
}
|
||||
|
||||
if($sortfield == "user")
|
||||
{
|
||||
|
||||
if($sortorder == "asc")
|
||||
{
|
||||
usort($sortable_table, "sort_by_user_asc");
|
||||
}
|
||||
else
|
||||
{
|
||||
usort($sortable_table, "sort_by_user_desc");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$sortable_table = dol_sort_array($sortable_table, $sortfield, $sortorder, 1, 0, 1);
|
||||
}
|
||||
|
||||
foreach ($sortable_table as $tablerow)
|
||||
{
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
// Remove link
|
||||
print '<td style="width: 24px">';
|
||||
if ($tablename != 'projet_task' && $tablename != 'stock_mouvement')
|
||||
{
|
||||
if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) // PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
|
||||
{
|
||||
print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . ($project_field ? '&projectfield=' . $project_field : '') . '" class="reposition">';
|
||||
print img_picto($langs->trans('Unlink'), 'unlink');
|
||||
print '</a>';
|
||||
}
|
||||
}
|
||||
print "</td>\n";
|
||||
|
||||
print '<td class="left nowrap" style="width: 200px">'.$tablerow->ref_text."</td>";
|
||||
print '<td class="center">'.$tablerow->date_text."</td>";
|
||||
print '<td class="left">'.$tablerow->user->getNomUrl(1, '', 48)."</td>";
|
||||
print '<td class="right" style="width: 120px">'.$tablerow->amount_ht_text."</td>";
|
||||
print '<td class="right" style="width: 120px">'.$tablerow->amount_ttc_text."</td>";
|
||||
print '<td class="right" style="width: 200px">'.$tablerow->status."</td>";
|
||||
|
||||
print '</tr>';
|
||||
}
|
||||
|
||||
if (canApplySubtotalOn($tablename))
|
||||
{
|
||||
$breakline = '<tr class="liste_total liste_sub_total">';
|
||||
@ -1259,7 +1328,6 @@ foreach ($listofreferent as $key => $value)
|
||||
}
|
||||
|
||||
//var_dump($element->thirdparty->name.' - '.$saved_third_id.' - '.$element->thirdparty->id);
|
||||
}
|
||||
|
||||
if ($breakline) print $breakline;
|
||||
|
||||
@ -1277,8 +1345,6 @@ foreach ($listofreferent as $key => $value)
|
||||
}
|
||||
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
|
||||
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>';
|
||||
// If fichinter add the total_duration
|
||||
if ($tablename == 'fichinter') print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
|
||||
print '<td class="right">';
|
||||
if (empty($value['disableamount']))
|
||||
{
|
||||
@ -1305,6 +1371,7 @@ foreach ($listofreferent as $key => $value)
|
||||
print $elementarray;
|
||||
}
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
print "<br>\n";
|
||||
}
|
||||
@ -1375,3 +1442,91 @@ function sortElementsByClientName($elementarray)
|
||||
|
||||
return $elementarray;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two TableRow objects by the $user variable in asc order
|
||||
*
|
||||
* @param TableRow $left The left object for the compare
|
||||
* @param TableRow $right The right object for the compare
|
||||
* @return int The compare result
|
||||
*/
|
||||
function sort_by_user_asc($left, $right)
|
||||
{
|
||||
if($left->user instanceof User && $right->user instanceof User)
|
||||
{
|
||||
return strtoupper($left->user->getFullName('', 0, -1)) > strtoupper($right->user->getFullName('', 0, -1));
|
||||
}
|
||||
elseif($left->user instanceof Societe && $right->user instanceof Societe)
|
||||
{
|
||||
return strtoupper($left->user->name) > strtoupper($right->user->name);
|
||||
}
|
||||
|
||||
throw new Exception('unknown class type for sorting in function [sort_by_user_asc] in class [\projet\element.php]');
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two TableRow objects by the $user variable in desc order
|
||||
*
|
||||
* @param TableRow $left The left object for the compare
|
||||
* @param TableRow $right The right object for the compare
|
||||
* @return int The compare result
|
||||
*/
|
||||
function sort_by_user_desc($left, $right)
|
||||
{
|
||||
if($left->user instanceof User && $right->user instanceof User)
|
||||
{
|
||||
return strtoupper($left->user->getFullName('', 0, -1)) < strtoupper($right->user->getFullName('', 0, -1));
|
||||
}
|
||||
elseif($left->user instanceof Societe && $right->user instanceof Societe)
|
||||
{
|
||||
return strtoupper($left->user->name) < strtoupper($right->user->name);
|
||||
}
|
||||
|
||||
throw new Exception('unknown class type for sorting in function [sort_by_user_des] in class [\projet\element.php]');
|
||||
}
|
||||
|
||||
/**
|
||||
* Presentation of a table row
|
||||
*/
|
||||
class TableRow
|
||||
{
|
||||
/**
|
||||
* The reference of this object (only for sorting)
|
||||
*/
|
||||
var $ref;
|
||||
|
||||
/**
|
||||
* The visible text for the reference (string or html)
|
||||
*/
|
||||
var $ref_text;
|
||||
|
||||
/**
|
||||
* The related user or societe of the object
|
||||
*/
|
||||
var $user;
|
||||
|
||||
/**
|
||||
* The ht amount of this object (only for sorting)
|
||||
*/
|
||||
var $amount_ht;
|
||||
|
||||
/**
|
||||
* The visible text for the $amount_ht (string or html)
|
||||
*/
|
||||
var $amount_ht_text;
|
||||
|
||||
/**
|
||||
* The ttc amount of this object (only for sorting)
|
||||
*/
|
||||
var $amount_ttc;
|
||||
|
||||
/**
|
||||
* The visible text for the $amount_ttc (string or html)
|
||||
*/
|
||||
var $amount_ttc_text;
|
||||
|
||||
/**
|
||||
* The status of the object (string or html)
|
||||
*/
|
||||
var $status;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user