'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
'."\n";
// Fields title search
-print '';
+// --------------------------------------------------------------------
+print '
';
if (!empty($arrayfields['m.rowid']['checked'])) {
// Ref
print '| ';
@@ -1052,7 +1171,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
if (!empty($arrayfields['m.datec']['checked'])) {
@@ -1064,13 +1183,16 @@ if (!empty($arrayfields['m.tms']['checked'])) {
print ' | ';
print ' | ';
}
-// Actions
+// Action column
print '';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
+$searchpicto = $form->showFilterButtons();
print $searchpicto;
print ' | ';
-print "
\n";
+print ''."\n";
+
+// Fields title label
+// --------------------------------------------------------------------
print '';
if (!empty($arrayfields['m.rowid']['checked'])) {
print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
@@ -1127,7 +1249,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['m.datec']['checked'])) {
print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1135,32 +1257,39 @@ if (!empty($arrayfields['m.datec']['checked'])) {
if (!empty($arrayfields['m.tms']['checked'])) {
print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
}
+// Action column
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-print "
\n";
+print ''."\n";
$arrayofuniqueproduct = array();
+
+// Loop on record
+// --------------------------------------------------------------------
$i = 0;
$totalarray = array();
$totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
- $objp = $db->fetch_object($resql);
+while ($i < ($limit ? min($num, $limit) : $num)) {
+ $obj = $db->fetch_object($resql);
+ if (empty($obj)) {
+ break; // Should not happen
+ }
- $userstatic->id = $objp->fk_user_author;
- $userstatic->login = $objp->login;
- $userstatic->lastname = $objp->lastname;
- $userstatic->firstname = $objp->firstname;
- $userstatic->photo = $objp->photo;
- $userstatic->email = $objp->user_email;
- $userstatic->statut = $objp->user_status;
+ $userstatic->id = $obj->fk_user_author;
+ $userstatic->login = $obj->login;
+ $userstatic->lastname = $obj->lastname;
+ $userstatic->firstname = $obj->firstname;
+ $userstatic->photo = $obj->photo;
+ $userstatic->email = $obj->user_email;
+ $userstatic->statut = $obj->user_status;
// Multilangs
if (!empty($conf->global->MAIN_MULTILANGS)) { // If multilang is enabled
// TODO Use a cache
$sql = "SELECT label";
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
- $sql .= " WHERE fk_product = ".((int) $objp->rowid);
+ $sql .= " WHERE fk_product = ".((int) $obj->rowid);
$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
$sql .= " LIMIT 1";
@@ -1168,37 +1297,37 @@ while ($i < min($num, $limit)) {
if ($result) {
$objtp = $db->fetch_object($result);
if (!empty($objtp->label)) {
- $objp->produit = $objtp->label;
+ $obj->produit = $objtp->label;
}
}
}
- $productstatic->id = $objp->rowid;
- $productstatic->ref = $objp->product_ref;
- $productstatic->label = $objp->produit;
- $productstatic->type = $objp->type;
- $productstatic->entity = $objp->entity;
- $productstatic->status = $objp->tosell;
- $productstatic->status_buy = $objp->tobuy;
- $productstatic->status_batch = $objp->tobatch;
+ $productstatic->id = $obj->rowid;
+ $productstatic->ref = $obj->product_ref;
+ $productstatic->label = $obj->produit;
+ $productstatic->type = $obj->type;
+ $productstatic->entity = $obj->entity;
+ $productstatic->status = $obj->tosell;
+ $productstatic->status_buy = $obj->tobuy;
+ $productstatic->status_batch = $obj->tobatch;
- $productlot->id = $objp->lotid;
- $productlot->batch = $objp->batch;
- $productlot->eatby = $objp->eatby;
- $productlot->sellby = $objp->sellby;
+ $productlot->id = $obj->lotid;
+ $productlot->batch = $obj->batch;
+ $productlot->eatby = $obj->eatby;
+ $productlot->sellby = $obj->sellby;
- $warehousestatic->id = $objp->entrepot_id;
- $warehousestatic->ref = $objp->warehouse_ref;
- $warehousestatic->label = $objp->warehouse_ref;
- $warehousestatic->lieu = $objp->lieu;
- $warehousestatic->fk_parent = $objp->fk_parent;
- $warehousestatic->statut = $objp->statut;
+ $warehousestatic->id = $obj->entrepot_id;
+ $warehousestatic->ref = $obj->warehouse_ref;
+ $warehousestatic->label = $obj->warehouse_ref;
+ $warehousestatic->lieu = $obj->lieu;
+ $warehousestatic->fk_parent = $obj->fk_parent;
+ $warehousestatic->statut = $obj->statut;
- $movement->type = $objp->type_mouvement;
+ $movement->type = $obj->type_mouvement;
- $arrayofuniqueproduct[$objp->rowid] = $objp->produit;
- if (!empty($objp->fk_origin)) {
- $origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
+ $arrayofuniqueproduct[$obj->rowid] = $obj->produit;
+ if (!empty($obj->fk_origin)) {
+ $origin = $movement->get_origin($obj->fk_origin, $obj->origintype);
} else {
$origin = '';
}
@@ -1208,12 +1337,12 @@ while ($i < min($num, $limit)) {
if (!empty($arrayfields['m.rowid']['checked'])) {
print '';
print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
- print $objp->mid;
+ print $obj->mid;
print ' | '; // This is primary not movement id
}
if (!empty($arrayfields['m.datem']['checked'])) {
// Date
- print ''.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').' | ';
+ print ''.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuserrel').' | ';
}
if (!empty($arrayfields['p.ref']['checked'])) {
// Product ref
@@ -1237,10 +1366,10 @@ while ($i < min($num, $limit)) {
print '';
}
if (!empty($arrayfields['pl.eatby']['checked'])) {
- print ''.dol_print_date($objp->eatby, 'day').' | ';
+ print ''.dol_print_date($obj->eatby, 'day').' | ';
}
if (!empty($arrayfields['pl.sellby']['checked'])) {
- print ''.dol_print_date($objp->sellby, 'day').' | ';
+ print ''.dol_print_date($obj->sellby, 'day').' | ';
}
// Warehouse
if (!empty($arrayfields['e.ref']['checked'])) {
@@ -1256,11 +1385,11 @@ while ($i < min($num, $limit)) {
}
if (!empty($arrayfields['m.inventorycode']['checked'])) {
// Inventory code
- print 'inventorycode.'$').'&search_type_mouvement='.urlencode($objp->type_mouvement).'">'.$objp->inventorycode.' | ';
+ print 'inventorycode.'$').'&search_type_mouvement='.urlencode($obj->type_mouvement).'">'.$obj->inventorycode.' | ';
}
if (!empty($arrayfields['m.label']['checked'])) {
// Label of movement
- print ''.$objp->label.' | ';
+ print ''.$obj->label.' | ';
}
if (!empty($arrayfields['origin']['checked'])) {
// Origin of movement
@@ -1269,8 +1398,8 @@ while ($i < min($num, $limit)) {
if (!empty($arrayfields['m.fk_projet']['checked'])) {
// fk_project
print '';
- if ($objp->fk_project != 0) {
- print $movement->get_origin($objp->fk_project, 'project');
+ if ($obj->fk_project != 0) {
+ print $movement->get_origin($obj->fk_project, 'project');
}
print ' | ';
}
@@ -1283,14 +1412,14 @@ while ($i < min($num, $limit)) {
if (!empty($arrayfields['m.value']['checked'])) {
// Qty
print '';
- if ($objp->qty > 0) {
+ if ($obj->qty > 0) {
print '';
print '+';
- print $objp->qty;
+ print $obj->qty;
print '';
} else {
print '';
- print $objp->qty;
+ print $obj->qty;
print '';
}
print ' | ';
@@ -1298,8 +1427,8 @@ while ($i < min($num, $limit)) {
if (!empty($arrayfields['m.price']['checked'])) {
// Price
print '';
- if ($objp->price != 0) {
- print price($objp->price);
+ if ($obj->price != 0) {
+ print price($obj->price);
}
print ' | ';
}
@@ -1307,25 +1436,26 @@ while ($i < min($num, $limit)) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'objp'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+ $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print '';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
- if (in_array($objp->mid, $arrayofselected)) {
+ if (in_array($obj->mid, $arrayofselected)) {
$selected = 1;
}
- print '';
+ print '';
}
print ' | ';
if (!$i) {
$totalarray['nbfield']++;
}
- print "\n";
+ print ''."\n";
+
$i++;
}
@@ -1365,6 +1495,26 @@ if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) {
//print '';
}
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+ $hidegeneratedfilelistifempty = 1;
+ if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+ $hidegeneratedfilelistifempty = 0;
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+ $formfile = new FormFile($db);
+
+ // Show list of available documents
+ $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+ $urlsource .= str_replace('&', '&', $param);
+
+ $filedir = $diroutputmassaction;
+ $genallowed = $permissiontoread;
+ $delallowed = $permissiontoadd;
+
+ print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 4f695f990e4..789b03aa6ce 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -58,8 +58,8 @@ $hookmanager->initHooks(array('productlotdocuments'));
// Get parameters
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) {
$page = 0;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 695e4356582..23e93aba785 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -623,7 +623,7 @@ if (empty($reshook)) {
}
print '';
-print '';
+print '';
print '
';
print '';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 91ff0b40fbc..1eba8556753 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -37,11 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('products', 'stocks', 'orders'));
-// Security check
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'produit|service');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'replenishorders'; // To manage different context of search
$sall = GETPOST('search_all', 'alphanohtml');
$sref = GETPOST('search_ref', 'alpha');
@@ -56,8 +52,8 @@ $search_dateday = GETPOST('search_dateday', 'int');
$search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
if (!$sortorder) {
$sortorder = 'DESC';
}
@@ -70,6 +66,12 @@ if ($page < 0) {
}
$offset = $limit * $page;
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'produit|service');
+
/*
* Actions
@@ -171,9 +173,10 @@ if ($resql) {
$num = $db->num_rows($resql);
$i = 0;
- print ''.$langs->trans("ReplenishmentOrdersDesc").'
';
+ print '';
$db->free($resql);
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 7f7f9610d1f..926b0c01634 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -36,8 +36,8 @@ $sref = GETPOST("sref", 'alpha');
$snom = GETPOST("snom", 'alpha');
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
if (!$sortfield) {
$sortfield = "e.ref";
}
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 32e8fc40381..b743dffbc53 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -77,8 +77,8 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
$search_thirdparty = GETPOST('search_thirdparty', 'alpha');
$search_declared_progress = GETPOST('search_declared_progress', 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
$monthofday = GETPOST('addtimemonth');
$dayofday = GETPOST('addtimeday');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index f84a7112504..763ecefe650 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -77,8 +77,8 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
$search_thirdparty = GETPOST('search_thirdparty', 'alpha');
$search_declared_progress = GETPOST('search_declared_progress', 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
$startdayarray = dol_get_first_day_week($day, $month, $year);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index dac2afa4834..d0b27caf326 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -165,6 +165,11 @@ class Task extends CommonObject
$this->label = trim($this->label);
$this->description = trim($this->description);
+ if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {
+ $this->errors[] = $langs->trans('StartDateCannotBeAfterEndDate');
+ return -1;
+ }
+
// Check parameters
// Put here code to add control on parameters values
@@ -384,6 +389,11 @@ class Task extends CommonObject
$this->budget_amount = trim($this->budget_amount);
}
+ if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {
+ $this->errors[] = $langs->trans('StartDateCannotBeAfterEndDate');
+ return -1;
+ }
+
// Check parameters
// Put here code to add control on parameters values
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 1bfbb9aa4a6..9e8d3a6ce8e 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -53,8 +53,8 @@ if ($id > 0 || !empty($ref)) {
// Get parameters
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) {
$page = 0;
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index e1f86bcffc9..51e78f23d57 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -56,8 +56,8 @@ if (!$user->rights->projet->lire) {
accessforbidden();
}
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4078afb20c0..6019011956a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -198,6 +198,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
// Add non object fields to fields for list
$arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
$arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
+$arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>-1, 'position'=>120);
$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
// Force some fields according to search_usage filter...
if (GETPOST('search_usage_opportunity')) {
@@ -911,7 +912,7 @@ if (!empty($arrayfields['p.public']['checked'])) {
// Opp status
if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
print '';
- print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100');
+ print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100', 1);
print ' | ';
}
if (!empty($arrayfields['p.opp_amount']['checked'])) {
@@ -933,6 +934,10 @@ if (!empty($arrayfields['p.budget_amount']['checked'])) {
print '';
print '';
}
+if (!empty($arrayfields['c.assigned']['checked'])) {
+ print '';
+ print ' | ';
+}
if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
print '';
print $form->selectyesno('search_usage_opportunity', $search_usage_opportunity, 1, false, 1);
@@ -1003,7 +1008,7 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
$arrayofstatus[$key] = $langs->trans($val);
}
$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
- print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth150 selectarrowonleft');
+ print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth125 selectarrowonleft');
print ajax_combobox('search_status');
print ' | ';
}
@@ -1052,6 +1057,9 @@ if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
if (!empty($arrayfields['p.budget_amount']['checked'])) {
print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
}
+if (!empty($arrayfields['c.assigned']['checked'])) {
+ print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
+}
if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right ');
}
@@ -1312,6 +1320,41 @@ while ($i < min($num, $limit)) {
$totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
}
}
+ // Contacts of project
+ if (!empty($arrayfields['c.assigned']['checked'])) {
+ print '';
+ $ifisrt = 1;
+ foreach (array('internal', 'external') as $source) {
+ $tab = $object->liste_contact(-1, $source);
+ $numcontact = count($tab);
+ if (!empty($numcontact)) {
+ foreach ($tab as $contactproject) {
+ //var_dump($contacttask);
+ if ($source == 'internal') {
+ $c = new User($db);
+ } else {
+ $c = new Contact($db);
+ }
+ $c->fetch($contactproject['id']);
+ if (!empty($c->photo)) {
+ if (get_class($c) == 'User') {
+ print $c->getNomUrl(-2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
+ } else {
+ print $c->getNomUrl(-2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
+ }
+ } else {
+ if (get_class($c) == 'User') {
+ print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
+ } else {
+ print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
+ }
+ }
+ $ifisrt = 0;
+ }
+ }
+ }
+ print ' | ';
+ }
// Usage opportunity
if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
print '';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e8c938d2156..dc482c1c60c 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -811,9 +811,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
print ' |