';
-$boxlist.='
';
-if(!empty($nbworkboardcount))
+$boxlist .= '
';
+if (!empty($nbworkboardcount))
{
- $boxlist.=$boxwork;
+ $boxlist .= $boxwork;
}
-$boxlist.=$resultboxes['boxlista'];
+$boxlist .= $resultboxes['boxlista'];
-$boxlist.= '
';
+$boxlist .= '
';
if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
{
// Remove allready present info in new dash board
- if(!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0){
+ if (!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0) {
foreach ($boxstatItems as $boxstatItemKey => $boxstatItemHtml) {
if (in_array($boxstatItemKey, $globalStatInTopOpenedDashBoard)) {
unset($boxstatItems[$boxstatItemKey]);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 8ae94aa536b..c288314947f 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -34,54 +34,54 @@ 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->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->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->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';
// 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->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 == '')
{
@@ -90,18 +90,18 @@ 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();
+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();
// 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');
+$result = restrictedArea($user, 'projet', $object->id, 'projet&project');
$hookmanager->initHooks(array('projectOverview'));
@@ -163,23 +163,23 @@ print '
';
print $langs->trans("Usage");
print ' ';
print '';
-if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
- print '';
- print '
';
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 (count($elementarray)>0 && is_array($elementarray))
+ 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)
@@ -759,49 +759,49 @@ 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.='
';
- $addform.='
';
- $addform.='
';
+ $addform .= '
';
+ $addform .= '
';
+ $addform .= '
';
}
}
if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew)
{
- $addform.='
';
- if ($testnew) $addform.='
'.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).' ';
+ $addform .= '
';
+ if ($testnew) $addform .= '
'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).' ';
elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
- $addform.='
'.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).' ';
+ $addform .= '
'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).' ';
}
- $addform.='
';
+ $addform .= '
';
}
print load_fiche_titre($langs->trans($title), $addform, '');
@@ -827,7 +827,7 @@ foreach ($listofreferent as $key => $value)
else print $langs->trans("ThirdParty");
print '';
// Duration of intervention
- if($tablename == 'fichinter')
+ if ($tablename == 'fichinter')
{
print '
';
print $langs->trans("TotalDuration");
@@ -915,7 +915,7 @@ foreach ($listofreferent as $key => $value)
{
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 '';
+ print ' id.($project_field ? '&projectfield='.$project_field : '').'" class="reposition">';
print img_picto($langs->trans('Unlink'), 'unlink');
print ' ';
}
@@ -1033,7 +1033,7 @@ foreach ($listofreferent as $key => $value)
print ' ';
// Add duration and store it in counter for fichinter
- if($tablename == 'fichinter')
+ if ($tablename == 'fichinter')
{
print '
';
print convertSecondToTime($element->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
@@ -1085,9 +1085,9 @@ foreach ($listofreferent as $key => $value)
if ($othermessage) print $othermessage;
if (isset($total_ht_by_line))
{
- if (! $qualifiedfortotal) print '';
+ if (!$qualifiedfortotal) print '';
print price($total_ht_by_line);
- if (! $qualifiedfortotal) print ' ';
+ if (!$qualifiedfortotal) print ' ';
}
if ($warning) print ' '.img_warning($warning);
print ' ';
@@ -1132,9 +1132,9 @@ foreach ($listofreferent as $key => $value)
if ($othermessage) print $othermessage;
if (isset($total_ttc_by_line))
{
- if (! $qualifiedfortotal) print '
';
+ if (!$qualifiedfortotal) print '';
print price($total_ttc_by_line);
- if (! $qualifiedfortotal) print ' ';
+ if (!$qualifiedfortotal) print ' ';
}
if ($warning) print ' '.img_warning($warning);
print '';
@@ -1219,7 +1219,7 @@ foreach ($listofreferent as $key => $value)
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '
'.$langs->trans("TotalHT").' : '.price($total_ht).' ';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '
'.$langs->trans("Total").' : '.price($total_ht).' ';
// If fichinter add the total_duration
- if($tablename == 'fichinter') print '
'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' ';
+ if ($tablename == 'fichinter') print '
'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' ';
print '
';
if (empty($value['disableamount']))
{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d7078e3b3a3..c35fdc0465e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1420,16 +1420,16 @@ class User extends CommonObject
$result = $this->create($user);
if ($result > 0)
{
- if (! empty($this->pass)) { // If a clear password was received (this situation should not happen anymore now), we use it to save it into database
+ if (!empty($this->pass)) { // If a clear password was received (this situation should not happen anymore now), we use it to save it into database
$newpass = $this->setPassword($user, $this->pass);
if (is_numeric($newpass) && $newpass < 0) $result = -2;
- } elseif (! empty($this->pass_crypted)) { // If a crypted password is already known, we save it directly into database because the previous create did not save it.
+ } elseif (!empty($this->pass_crypted)) { // If a crypted password is already known, we save it directly into database because the previous create did not save it.
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
$sql .= " SET pass_crypted = '".$this->db->escape($this->pass_crypted)."'";
$sql .= " WHERE rowid=".$this->id;
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
$result = -1;
}