diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index b9beb792ba68c4f94ebf45ea35e3b04467f71281..09fda82223b75e8b3f3b9f6d09e3000d85276d0c 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -297,7 +297,7 @@ else
}
else
{
- print "<tr ".$bc[false].'><td colspan="3">'.$langs->trans("NoSubCat")."</td></tr>";
+ print "<tr ".$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoSubCat")."</td></tr>";
}
print "</table>\n";
}
@@ -371,7 +371,7 @@ if ($object->type == Categorie::TYPE_PRODUCT)
}
else
{
- print "<tr ".$bc[false].'><td colspan="2">'.$langs->trans("ThisCategoryHasNoProduct")."</td></tr>";
+ print "<tr ".$bc[false].'><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoProduct")."</td></tr>";
}
print "</table>\n";
}
@@ -422,7 +422,7 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
}
else
{
- print "<tr ".$bc[false]."><td>".$langs->trans("ThisCategoryHasNoSupplier")."</td></tr>";
+ print '<tr '.$bc[false].'><td class="opacitymedium">'.$langs->trans("ThisCategoryHasNoSupplier").'</td></tr>';
}
print "</table>\n";
}
@@ -475,7 +475,7 @@ if($object->type == Categorie::TYPE_CUSTOMER)
}
else
{
- print "<tr ".$bc[false]."><td>".$langs->trans("ThisCategoryHasNoCustomer")."</td></tr>";
+ print '<tr '.$bc[false].'><td class="opacitymedium">'.$langs->trans("ThisCategoryHasNoCustomer").'</td></tr>';
}
print "</table>\n";
}
@@ -529,7 +529,7 @@ if ($object->type == Categorie::TYPE_MEMBER)
}
else
{
- print "<tr ".$bc[false].'><td colspan="3">'.$langs->trans("ThisCategoryHasNoMember")."</td></tr>";
+ print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoMember").'</td></tr>';
}
print "</table>\n";
}
@@ -582,7 +582,7 @@ if($object->type == Categorie::TYPE_CONTACT)
}
else
{
- print "<tr ".$bc[false]."><td>".$langs->trans("ThisCategoryHasNoContact")."</td></tr>";
+ print '<tr '.$bc[false].'><td class="opacitymedium">'.$langs->trans("ThisCategoryHasNoContact").'</td></tr>';
}
print "</table>\n";
}
@@ -636,7 +636,7 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
}
else
{
- print "<tr ".$bc[false].'><td colspan="3">'.$langs->trans("ThisCategoryHasNoAccount")."</td></tr>";
+ print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoAccount").'</td></tr>';
}
print "</table>\n";
}
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index b4ea22d59ebeccd63eb8d5cb7fa5ef797489bd9a..416975acfdbe57a5b3902888c3d8de1acecd9926 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -111,10 +111,15 @@ if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_
{
$arrayresult['searchintointervention']=array('text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
}
+// HR
if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
{
$arrayresult['searchintoexpensereport']=array('text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?sall='.urlencode($search_boxvalue));
}
+if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
+{
+ $arrayresult['searchintoleaves']=array('text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?sall='.urlencode($search_boxvalue));
+}
/* Do we really need this. We already have a select for users, and we should be able to filter into user list on employee flag
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5ebe7c13a910e2733ab90319ae9d111e60b792d5..3f022bf0aa760bdd08a6263db656959cb92ac896 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1155,8 +1155,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
$newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
- if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
+ if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
}
// Expeditions
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 6fbd411f42040e7a0f2dccf21c23e8e72f6268ce..60048f3fe1b0e50edd296e1f89e6bec1ec656d4c 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -85,6 +85,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
$fieldstosearchall = array(
'cp.rowid'=>'Ref',
'cp.description'=>'Description',
+ 'uu.lastname'=>'EmployeeLastname',
+ 'uu.firstname'=>'EmployeeFirstname'
);
@@ -428,7 +430,7 @@ if (! empty($holiday->holiday))
if($holiday_payes == '2')
{
print '<tr>';
- print '<td colspan="10" '.$bc[false].'">'.$langs->trans('None').'</td>';
+ print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
print '</tr>';
}
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 4113dd62aa0b98f831b1c403152dcd8176d6ab81..38dc854b5f9a96b1a37cb2096e21b4bbdb2d07d8 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -76,6 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
HolidaysMonthlyUpdate=Monthly update
ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
+EmployeeLastname=Employee lastname
+EmployeeFirstname=Employee firstname
## Configuration du Module ##
LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 4b41f0ba038c4009df58010cf15f2a6ab6a4e4ad..fb59e1dd8fd1b95041e2aad218f96bdee9aca993 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -751,5 +751,6 @@ SearchIntoCustomerProposals=Customer proposals
SearchIntoSupplierProposals=Supplier proposals
SearchIntoInterventions=Interventions
SearchIntoContracts=Contracts
-SearchIntoExpenseReports=Expense reports
SearchIntoCustomerShipments=Customer shipments
+SearchIntoExpenseReports=Expense reports
+SearchIntoLeaves=Leaves
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 3a01d952acd766e553c4238e3a049463868620c7..138cfe45a2b4ce716e72bdad7b91e0d9caf0a1a6 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -146,7 +146,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
// Choice of type of product
if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
- if ((string) $type != '0') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=0">';
+ if ((string) $type != '0') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=0'.($mode?'&mode='.$mode:'').'">';
else print img_picto('','tick').' ';
print $langs->trans("Products");
if ((string) $type != '0') print '</a>';
@@ -154,7 +154,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
else print ' / ';
- if ((string) $type != '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=1">';
+ if ((string) $type != '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=1'.($mode?'&mode='.$mode:'').'">';
else print img_picto('','tick').' ';
print $langs->trans("Services");
if ((string) $type != '1') print '</a>';
@@ -162,7 +162,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
else print ' / ';
- if ((string) $type == '0' || (string) $type == '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'">';
+ if ((string) $type == '0' || (string) $type == '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($mode?'&mode='.$mode:'').'">';
else print img_picto('','tick').' ';
print $langs->trans("ProductsAndServices");
if ((string) $type == '0' || (string) $type == '1') print '</a>';
@@ -172,7 +172,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
print '<br>';
}
- // Choice of stats
+ // Choice of stats mode (byunit or bynumber)
if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=byunit">';
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 6d3dc65903eead665a1442d5a3f771c4c768963e..794e9c3af00bae2bb4510e1ad0e749906d4f1865 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -196,17 +196,20 @@ if ($id > 0 || ! empty($ref))
print dol_print_date($object->date_end,'day');
print '</td></tr>';
- // Opportunity status
- print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
- $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
- if ($code) print $langs->trans("OppStatus".$code);
- print '</td></tr>';
-
- // Opportunity Amount
- print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
- if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
- print '</td></tr>';
-
+ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+ {
+ // Opportunity status
+ print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+ $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+ if ($code) print $langs->trans("OppStatus".$code);
+ print '</td></tr>';
+
+ // Opportunity Amount
+ print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+ if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
+ print '</td></tr>';
+ }
+
// Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>';
if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 86928cbf2b9aa5d023c77b3b20e887ebbb8c1bef..1664f2e726973f43b4ba58965fa67d22429db9d8 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -157,16 +157,19 @@ print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'day');
print '</td></tr>';
-// Opportunity status
-print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-if ($code) print $langs->trans("OppStatus".$code);
-print '</td></tr>';
-
-// Opportunity Amount
-print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
-print '</td></tr>';
+if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+{
+ // Opportunity status
+ print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+ $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+ if ($code) print $langs->trans("OppStatus".$code);
+ print '</td></tr>';
+
+ // Opportunity Amount
+ print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+ if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency);
+ print '</td></tr>';
+}
// Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>';
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 498db12ddc6259afd67db591188bcc06eb63f899..b86a961bd69e55c4e83e46e88d4e21a14a46484b 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -142,7 +142,11 @@ if ($id > 0 || ! empty($ref))
print dol_print_date($object->date_end,'day');
print '</td></tr>';
-
+ // Budget
+ print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+ if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
+ print '</td></tr>';
+
print '</table>';
print '</div>';
@@ -263,7 +267,7 @@ if (count($tasksarray)>0)
}
else
{
- print $langs->trans("NoTasks");
+ print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
}
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index ef4be16f51edb4188880279e1c5407c30778a80f..43df7ce3b3d5bb6b7112539f948785639e7c7386 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -122,6 +122,11 @@ if ($id > 0 || ! empty($ref))
print dol_print_date($object->date_end,'day');
print '</td></tr>';
+ // Budget
+ print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+ if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
+ print '</td></tr>';
+
print "</table>";
print '<br>';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ab7e2849330d97ec42e7c92c8b7d2f7169fc71d6..3d61c96299ba281b20eab9967a748a07d571c8f7 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -248,6 +248,11 @@ if ($id > 0 || ! empty($ref))
print dol_print_date($object->date_end,'day');
print '</td></tr>';
+ // Budget
+ print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+ if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,0,0,0,$conf->currency);
+ print '</td></tr>';
+
// Other options
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -444,7 +449,7 @@ else if ($id > 0 || ! empty($ref))
}
else
{
- print '<tr '.$bc[false].'><td colspan="9">'.$langs->trans("NoTasks").'</td></tr>';
+ print '<tr '.$bc[false].'><td colspan="9" class="opacitymedium">'.$langs->trans("NoTasks").'</td></tr>';
}
print "</table>";