diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 0162b7f24a1..50d6be57154 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -603,7 +603,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) { } // Add fields from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql .= " FROM "; if ($search_bid > 0) { @@ -617,7 +617,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) && is_arra // Add fields from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListJoin', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListJoin', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql .= " WHERE b.fk_account = ba.rowid"; @@ -709,7 +709,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql .= $db->order($sortfield, $sortorder); @@ -1075,7 +1075,7 @@ if ($resql) { } $parameters = array(); - $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { $moreforfilter .= $hookmanager->resPrint; } else { @@ -1277,7 +1277,7 @@ if ($resql) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray); - $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action edit/delete and select print ''; @@ -1838,7 +1838,7 @@ if ($resql) { // Fields from hook $parameters = array('arrayfields' => $arrayfields, 'obj' => $objp, 'i' => $i, 'totalarray' => &$totalarray); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook + $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $objecttmpect may have been modified by hook print $hookmanager->resPrint; // Action edit/delete and select diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cdc7057c05d..141a83337ac 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3028,7 +3028,6 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi $morehtmlref = $hookmanager->resPrint; } - print '
'; print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright); print '
'; diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php index 3addf2c8c22..570c8c11f54 100644 --- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php +++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php @@ -1248,6 +1248,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders $pdf->SetXY($posx, $posy); $pdf->SetTextColor(0, 0, 60); $title = $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref); + if ($object->status == $object::STATUS_DRAFT) { + $pdf->SetTextColor(128, 0, 0); + $title .= ' - '.$outputlangs->transnoentities("NotValidated"); + } $pdf->MultiCell($w, 3, $title, '', 'R'); $posy += 1; @@ -1289,12 +1293,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders $pdf->SetXY($posx, $posy); $pdf->SetTextColor(0, 0, 60); $pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R'); - } else { + } + // no point in having this here this a document sent to supplier + /*} else { $posy += 5; $pdf->SetXY($posx, $posy); $pdf->SetTextColor(255, 0, 0); $pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R'); - } + }*/ + $pdf->SetTextColor(0, 0, 60); $usehourmin = 'day'; diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php index 49c81f064ea..9fd63c8ce7e 100644 --- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php @@ -1161,6 +1161,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetXY($posx, $posy); $pdf->SetTextColor(0, 0, 60); $title = $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref); + if ($object->status == $object::STATUS_DRAFT) { + $pdf->SetTextColor(128, 0, 0); + $title .= ' - '.$outputlangs->transnoentities("NotValidated"); + } $pdf->MultiCell($w, 3, $title, '', 'R'); $posy += 1; @@ -1202,12 +1206,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetXY($posx, $posy); $pdf->SetTextColor(0, 0, 60); $pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R'); - } else { + } + // no point in having this here this a document sent to supplier + /*} else { $posy += 5; $pdf->SetXY($posx, $posy); $pdf->SetTextColor(255, 0, 0); $pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R'); - } + }*/ $pdf->SetTextColor(0, 0, 60); $usehourmin = 'day'; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 7f8b2484580..4ac91b134e4 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -668,7 +668,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) { } // Add fields from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sqlfields = $sql; // $sql fields to remove for count total @@ -700,7 +700,7 @@ if ($search_user > 0) { // Add table from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql .= " WHERE e.entity IN (".getEntity('expedition').")"; @@ -844,12 +844,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; // Add HAVING from hooks $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint; $nbtotalofrecords = ''; @@ -1123,7 +1123,7 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) { $moreforfilter .= ''; } $parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { $moreforfilter .= $hookmanager->resPrint; } else { @@ -1261,7 +1261,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, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Date creation if (!empty($arrayfields['e.datec']['checked'])) { @@ -1372,7 +1372,7 @@ if (!empty($arrayfields['e.note_private']['checked'])) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, '$totalarray' => &$totalarray); -$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; if (!empty($arrayfields['e.datec']['checked'])) { print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap '); @@ -1622,7 +1622,7 @@ while ($i < $imaxinloop) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; // Fields from hook $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Date creation if (!empty($arrayfields['e.datec']['checked'])) { @@ -1692,7 +1692,7 @@ if ($num == 0) { $db->free($resql); $parameters = array('arrayfields' => $arrayfields, 'totalarray' => $totalarray, 'sql' => $sql); -$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; print ""; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index b22e0d9d0fc..aa2627af406 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -744,7 +744,7 @@ if (!empty($arrayfields['d.total_ttc']['checked'])) { 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, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; if (!empty($arrayfields['d.date_create']['checked'])) { print_liste_field_titre($arrayfields['d.date_create']['label'], $_SERVER["PHP_SELF"], "d.date_create", "", $param, '', $sortfield, $sortorder, 'nowraponall center'); @@ -961,7 +961,7 @@ if ($num > 0) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; // Fields from hook $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Date creation diff --git a/htdocs/langs/am_ET/recruitment.lang b/htdocs/langs/am_ET/recruitment.lang index c383437a92c..725005604bc 100644 --- a/htdocs/langs/am_ET/recruitment.lang +++ b/htdocs/langs/am_ET/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=እየቀጠርን ነው። ይህ የሚሞሉ ክፍት የ NoPositionOpen=በአሁኑ ጊዜ ምንም ክፍት ቦታዎች የሉም ConfirmClose=መሰረዙን ያረጋግጡ ConfirmCloseAsk=እርግጠኛ ነዎት ይህን የምልመላ እጩ መሰረዝ ይፈልጋሉ -recruitment=ምልመላ +Recruitment=ምልመላ diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang index 3b6d3c13750..884d6a9c830 100644 --- a/htdocs/langs/ar_SA/recruitment.lang +++ b/htdocs/langs/ar_SA/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=نحن نوظف. هذه قائمة بالوظائف الشاغر NoPositionOpen=لا توجد وظائف مفتوحة في الوقت الحالي ConfirmClose=تأكيد الالغاء ConfirmCloseAsk=هل أنت متأكد أنك تريد إلغاء ترشيح التوظيف هذا -recruitment=توظيف +Recruitment=توظيف diff --git a/htdocs/langs/az_AZ/recruitment.lang b/htdocs/langs/az_AZ/recruitment.lang index efb490607d8..e55c4d3ec8b 100644 --- a/htdocs/langs/az_AZ/recruitment.lang +++ b/htdocs/langs/az_AZ/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=İşə qəbul edirik. Bu doldurulmalı olan açıq vəzifələri NoPositionOpen=Hazırda heç bir vəzifə açıq deyil ConfirmClose=Ləğv etməyi təsdiqləyin ConfirmCloseAsk=Bu işə qəbul namizədliyini ləğv etmək istədiyinizə əminsiniz -recruitment=İşə qəbul +Recruitment=İşə qəbul diff --git a/htdocs/langs/bg_BG/recruitment.lang b/htdocs/langs/bg_BG/recruitment.lang index b2efc822f2f..267904c7861 100644 --- a/htdocs/langs/bg_BG/recruitment.lang +++ b/htdocs/langs/bg_BG/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Ние набираме персонал. Това е списъ NoPositionOpen=В момента няма отворени позиции ConfirmClose=Потвърдете анулирането ConfirmCloseAsk=Сигурни ли сте, че искате, за да отмените тази кандидатура за набиране на персонал -recruitment=подбор на персонал +Recruitment=подбор на персонал diff --git a/htdocs/langs/bn_BD/recruitment.lang b/htdocs/langs/bn_BD/recruitment.lang index c2578b25dc0..79a01ca547f 100644 --- a/htdocs/langs/bn_BD/recruitment.lang +++ b/htdocs/langs/bn_BD/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=আমরা নিয়োগ করছি। এটি পূ NoPositionOpen=এই মুহূর্তে কোনো পজিশন খোলা নেই ConfirmClose=বাতিল নিশ্চিত করুন ConfirmCloseAsk=আপনি কি নিশ্চিত যে আপনি এই নিয়োগের প্রার্থীতা বাতিল করতে চান? -recruitment=নিয়োগ +Recruitment=নিয়োগ diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang index c6570ca5baa..73cc4dc1094 100644 --- a/htdocs/langs/bn_IN/recruitment.lang +++ b/htdocs/langs/bn_IN/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=আমরা নিয়োগ করছি। এটি পূ NoPositionOpen=এই মুহূর্তে কোন পজিশন খোলা নেই ConfirmClose=বাতিল নিশ্চিত করুন ConfirmCloseAsk=আপনি কি নিশ্চিত যে আপনি এই নিয়োগের প্রার্থীতা বাতিল করতে চান? -recruitment=নিয়োগ +Recruitment=নিয়োগ diff --git a/htdocs/langs/bs_BA/recruitment.lang b/htdocs/langs/bs_BA/recruitment.lang index 4ff63bae5ea..f38076fc5cf 100644 --- a/htdocs/langs/bs_BA/recruitment.lang +++ b/htdocs/langs/bs_BA/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Zapošljavamo. Ovo je lista otvorenih pozicija koje treba popuni NoPositionOpen=Trenutno nema otvorenih pozicija ConfirmClose=Potvrdite otkazivanje ConfirmCloseAsk=Jeste li sigurni da želite poništiti ovu kandidaturu za zapošljavanje -recruitment=Regrutacija +Recruitment=Regrutacija diff --git a/htdocs/langs/cs_CZ/recruitment.lang b/htdocs/langs/cs_CZ/recruitment.lang index 9eb0850ee7a..dde9203e8a4 100644 --- a/htdocs/langs/cs_CZ/recruitment.lang +++ b/htdocs/langs/cs_CZ/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/cy_GB/recruitment.lang b/htdocs/langs/cy_GB/recruitment.lang index 2ecbacacb14..b1af13db85d 100644 --- a/htdocs/langs/cy_GB/recruitment.lang +++ b/htdocs/langs/cy_GB/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang index e3c978a2b57..dda0a2fda57 100644 --- a/htdocs/langs/da_DK/recruitment.lang +++ b/htdocs/langs/da_DK/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Vi rekrutterer. Dette er en liste over ledige stillinger, der sk NoPositionOpen=Ingen ledige stillinger i øjeblikket ConfirmClose=Bekræft annullering ConfirmCloseAsk=Er du sikker på, at du vil annullere denne rekrutteringskandidatur -recruitment=Rekruttering +Recruitment=Rekruttering diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang index 89084f43214..7404d1e55bf 100644 --- a/htdocs/langs/de_DE/recruitment.lang +++ b/htdocs/langs/de_DE/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Wir stellen ein. Dies ist eine Liste mit offenen Stellen, die zu NoPositionOpen=Zur Zeit sind keine Stellen offen ConfirmClose=Abbruch bestätigen ConfirmCloseAsk=Sind Sie sicher, dass Sie diese Stellenausschreibung beenden wollen? -recruitment=Personalbeschaffung +Recruitment=Personalbeschaffung diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang index a7787d909ef..5e50f615758 100644 --- a/htdocs/langs/el_GR/recruitment.lang +++ b/htdocs/langs/el_GR/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Προσλαμβάνουμε. Αυτή είναι η λίστα NoPositionOpen=Δεν υπάρχουν ανοιχτές θέσεις αυτή τη στιγμή ConfirmClose=Επιβεβαιώστε την ακύρωση ConfirmCloseAsk=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτήν την υποψηφιότητα πρόσληψης -recruitment=Προσλήψεις +Recruitment=Προσλήψεις diff --git a/htdocs/langs/es_AR/recruitment.lang b/htdocs/langs/es_AR/recruitment.lang index 59bd4ab3243..b073d7d188e 100644 --- a/htdocs/langs/es_AR/recruitment.lang +++ b/htdocs/langs/es_AR/recruitment.lang @@ -8,3 +8,4 @@ JobLabel=Etiqueta de puesto de trabajo ResponsibleOfRecruitement=Responsable de contrataciones IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un lugar asociado Remuneration=Sueldo +Recruitment=Contrataciones diff --git a/htdocs/langs/es_ES/recruitment.lang b/htdocs/langs/es_ES/recruitment.lang index 4852fe02be6..0d19fe7fd70 100644 --- a/htdocs/langs/es_ES/recruitment.lang +++ b/htdocs/langs/es_ES/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Estamos reclutando. Esta es una lista de vacantes a cubrir... NoPositionOpen=No hay posiciones abiertas en este momento ConfirmClose=Confirmar cancelación ConfirmCloseAsk=¿Está seguro de que desea cancelar esta candidatura de contratación? -recruitment=Contratación +Recruitment=Contratación diff --git a/htdocs/langs/es_MX/recruitment.lang b/htdocs/langs/es_MX/recruitment.lang index a31ec3acb6e..32530ae8e0e 100644 --- a/htdocs/langs/es_MX/recruitment.lang +++ b/htdocs/langs/es_MX/recruitment.lang @@ -26,3 +26,4 @@ JobClosedTextCanceled=La vacante esta cerrada. ExtrafieldsJobPosition=Atributos complementarios (puestos de trabajo) ExtrafieldsApplication=Atributos complementarios (solicitudes de empleo) MakeOffer=Hacer una oferta +Recruitment=Reclutamiento diff --git a/htdocs/langs/et_EE/recruitment.lang b/htdocs/langs/et_EE/recruitment.lang index b11a87ab34c..82af1e8462e 100644 --- a/htdocs/langs/et_EE/recruitment.lang +++ b/htdocs/langs/et_EE/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/fa_IR/recruitment.lang b/htdocs/langs/fa_IR/recruitment.lang index 645f80cbbd5..ccb17e13db9 100644 --- a/htdocs/langs/fa_IR/recruitment.lang +++ b/htdocs/langs/fa_IR/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/fi_FI/recruitment.lang b/htdocs/langs/fi_FI/recruitment.lang index 0ff6f0cf646..054463e4705 100644 --- a/htdocs/langs/fi_FI/recruitment.lang +++ b/htdocs/langs/fi_FI/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Olemme rekrytoimassa. Tämä on lista avoimista työpaikoista, j NoPositionOpen=Tällä hetkellä ei avoimia paikkoja ConfirmClose=Vahvista peruutus ConfirmCloseAsk=Haluatko varmasti peruuttaa tämän rekrytointiehdokkaan -recruitment=Rekrytointi +Recruitment=Rekrytointi diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang index 94757e08260..cb9629536a2 100644 --- a/htdocs/langs/gl_ES/recruitment.lang +++ b/htdocs/langs/gl_ES/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Estamos contratando. Esta é unha lista de prazas abertas para c NoPositionOpen=Non hai postos laborais libres polo momento ConfirmClose=Confirmar cancelación ConfirmCloseAsk=Está certo de querer cancelar esta candidatura de contratación? -recruitment=Contratación +Recruitment=Contratación diff --git a/htdocs/langs/he_IL/recruitment.lang b/htdocs/langs/he_IL/recruitment.lang index afbdae73266..cafa480551d 100644 --- a/htdocs/langs/he_IL/recruitment.lang +++ b/htdocs/langs/he_IL/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=אנחנו מגייסים. זוהי רשימה של משרות NoPositionOpen=אין משרות פתוחות כרגע ConfirmClose=אשר את הביטול ConfirmCloseAsk=האם אתה בטוח שברצונך לבטל את מועמדות הגיוס הזו -recruitment=גיוס +Recruitment=גיוס diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang index 4768825c7a9..ccfec3f1cfd 100644 --- a/htdocs/langs/hr_HR/recruitment.lang +++ b/htdocs/langs/hr_HR/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Zapošljavamo. Ovo je popis otvorenih pozicija koje treba popuni NoPositionOpen=Trenutno nema otvorenih pozicija ConfirmClose=Potvrdite otkazivanje ConfirmCloseAsk=Jeste li sigurni da želite da poništite ovu kandidaturu za zapošljavanje -recruitment=Zapošljavanje +Recruitment=Zapošljavanje diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang index 0f8dd0917f9..085a8140203 100644 --- a/htdocs/langs/hu_HU/recruitment.lang +++ b/htdocs/langs/hu_HU/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Toborozunk. Ez a betöltendő pozíciók listája... NoPositionOpen=Jelenleg nincs nyitott pozíció ConfirmClose=Erősítse meg a törlést ConfirmCloseAsk=Biztosan visszavonja ezt a toborzási jelentkezést? -recruitment=Toborzás +Recruitment=Toborzás diff --git a/htdocs/langs/is_IS/recruitment.lang b/htdocs/langs/is_IS/recruitment.lang index fcbf87e49f4..eecdc1f004c 100644 --- a/htdocs/langs/is_IS/recruitment.lang +++ b/htdocs/langs/is_IS/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang index 048564b05da..64f58c1d2e1 100644 --- a/htdocs/langs/ja_JP/recruitment.lang +++ b/htdocs/langs/ja_JP/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=募集中。これは、募集職種のリスト... NoPositionOpen=現在募集職種なし ConfirmClose=確定 キャンセル ConfirmCloseAsk=この採用候補をキャンセルしてもよいか -recruitment=採用 +Recruitment=採用 diff --git a/htdocs/langs/ko_KR/recruitment.lang b/htdocs/langs/ko_KR/recruitment.lang index fcd0d820dcb..bd5ee9c7714 100644 --- a/htdocs/langs/ko_KR/recruitment.lang +++ b/htdocs/langs/ko_KR/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/lo_LA/recruitment.lang b/htdocs/langs/lo_LA/recruitment.lang index b548b0962ce..7edf516279b 100644 --- a/htdocs/langs/lo_LA/recruitment.lang +++ b/htdocs/langs/lo_LA/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=ພວກເຮົາຮັບສະໝັກພະນັກງ NoPositionOpen=ບໍ່​ມີ​ຕໍາ​ແຫນ່ງ​ເປີດ​ໃນ​ປັດ​ຈຸ​ບັນ​ ConfirmClose=ຢືນຢັນການຍົກເລີກ ConfirmCloseAsk=ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການຍົກເລີກການສະໝັກຮັບສະໝັກງານນີ້ -recruitment=ຮັບສະໝັກພະນັກງານ +Recruitment=ຮັບສະໝັກພະນັກງານ diff --git a/htdocs/langs/lt_LT/recruitment.lang b/htdocs/langs/lt_LT/recruitment.lang index e6cb239b75d..b32ab3fe8d8 100644 --- a/htdocs/langs/lt_LT/recruitment.lang +++ b/htdocs/langs/lt_LT/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang index 9877fa91439..f7293a1cebc 100644 --- a/htdocs/langs/nb_NO/recruitment.lang +++ b/htdocs/langs/nb_NO/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Vi rekrutterer. Dette er en liste over ledige stillinger som ska NoPositionOpen=Ingen ledige stillinger for øyeblikket ConfirmClose=Bekreft kansellering ConfirmCloseAsk=Er du sikker på at du vil kansellere dette rekrutteringskandidaturet -recruitment=Rekruttering +Recruitment=Rekruttering diff --git a/htdocs/langs/nl_NL/recruitment.lang b/htdocs/langs/nl_NL/recruitment.lang index 2cfc7c2bd76..773fc767518 100644 --- a/htdocs/langs/nl_NL/recruitment.lang +++ b/htdocs/langs/nl_NL/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We zijn aan het rekruteren. Dit is een lijst met openstaande vac NoPositionOpen=Op dit moment geen vacatures ConfirmClose=Bevestig de annulering ConfirmCloseAsk=Weet u zeker dat u deze sollicitatiekandidatuur wilt annuleren? -recruitment=Werving +Recruitment=Werving diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang index 501c3a34c8c..fd197bdfa9b 100644 --- a/htdocs/langs/pl_PL/recruitment.lang +++ b/htdocs/langs/pl_PL/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Prowadzimy rekrutację. Oto lista wolnych stanowisk do obsadzeni NoPositionOpen=W tej chwili nie ma żadnych wolnych stanowisk ConfirmClose=Potwierdź anulowanie ConfirmCloseAsk=Czy na pewno chcesz anulować tę kandydaturę rekrutacyjną? -recruitment=Rekrutacja +Recruitment=Rekrutacja diff --git a/htdocs/langs/pt_PT/recruitment.lang b/htdocs/langs/pt_PT/recruitment.lang index c2764aa40cd..0d37fbe3b7b 100644 --- a/htdocs/langs/pt_PT/recruitment.lang +++ b/htdocs/langs/pt_PT/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Estamos recrutando. Esta é uma lista de abrir cargos a serem pr NoPositionOpen=Nenhuma posição abrir no momento ConfirmClose=Confirme cancelamento ConfirmCloseAsk=Tem a certeza que pretende para cancelar esta candidatura de recrutamento -recruitment=Recrutamento +Recruitment=Recrutamento diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang index f0696fc4bdb..7e4e878c111 100644 --- a/htdocs/langs/ro_RO/recruitment.lang +++ b/htdocs/langs/ro_RO/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Recrutăm. Aceasta este o listă de posturi vacante care trebuie NoPositionOpen=Niciun post vacant la acest moment ConfirmClose=Confirmare anulare ConfirmCloseAsk=Sigur vrei să anulezi această candidatură de recrutare -recruitment=Recrutare personal +Recruitment=Recrutare personal diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang index c0ee8aea68f..f132113f432 100644 --- a/htdocs/langs/ru_RU/recruitment.lang +++ b/htdocs/langs/ru_RU/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Мы набираем. Это список вакансий, к NoPositionOpen=На данный момент открытых позиций нет ConfirmClose=Подтвердить отмену ConfirmCloseAsk=Вы действительно хотите — отменить этой кандидатуре найма -recruitment=Рекрутинг +Recruitment=Рекрутинг diff --git a/htdocs/langs/sk_SK/recruitment.lang b/htdocs/langs/sk_SK/recruitment.lang index cf5d1293bd6..833b33a8d39 100644 --- a/htdocs/langs/sk_SK/recruitment.lang +++ b/htdocs/langs/sk_SK/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Robíme nábor. Toto je zoznam voľných pozícií, ktoré sa ma NoPositionOpen=Momentálne nie sú otvorené žiadne pozície ConfirmClose=Potvrďte zrušenie ConfirmCloseAsk=Naozaj chcete zrušiť túto náborovú kandidatúru? -recruitment=Nábor +Recruitment=Nábor diff --git a/htdocs/langs/sl_SI/recruitment.lang b/htdocs/langs/sl_SI/recruitment.lang index 151861ecc61..44b17927730 100644 --- a/htdocs/langs/sl_SI/recruitment.lang +++ b/htdocs/langs/sl_SI/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Zaposlujemo. To je seznam odprtih delovnih mest, ki jih je treba NoPositionOpen=Trenutno ni odprtih pozicij ConfirmClose=Potrdite preklic ConfirmCloseAsk=Ali ste prepričani, da želite preklicati to kandidaturo za zaposlitev -recruitment=Zaposlovanje +Recruitment=Zaposlovanje diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang index 0557a301aca..ed09d264b77 100644 --- a/htdocs/langs/sq_AL/recruitment.lang +++ b/htdocs/langs/sq_AL/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Ne jemi duke rekrutuar. Kjo është lista e pozicioneve të hapu NoPositionOpen=Asnjë pozicion i hapur për momentin ConfirmClose=Konfirmo anulimin ConfirmCloseAsk=Jeni i sigurt që dëshironi ta anuloni këtë kandidaturë rekrutimi -recruitment=Rekrutimi +Recruitment=Rekrutimi diff --git a/htdocs/langs/sr_RS/recruitment.lang b/htdocs/langs/sr_RS/recruitment.lang index 5a9da1a619d..7ac29b962dd 100644 --- a/htdocs/langs/sr_RS/recruitment.lang +++ b/htdocs/langs/sr_RS/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/sv_SE/recruitment.lang b/htdocs/langs/sv_SE/recruitment.lang index 29d07ff94d1..39cd152144a 100644 --- a/htdocs/langs/sv_SE/recruitment.lang +++ b/htdocs/langs/sv_SE/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Vi rekryterar! Detta är en lista över lediga tjänster som ska NoPositionOpen=Inga lediga tjänster för tillfället ConfirmClose=Bekräfta avbokningen ConfirmCloseAsk=Är du säker på att du vill avbryta denna rekryteringskandidatur -recruitment=Rekrytering +Recruitment=Rekrytering diff --git a/htdocs/langs/sw_SW/recruitment.lang b/htdocs/langs/sw_SW/recruitment.lang index a020f407774..1f3cc99fd5f 100644 --- a/htdocs/langs/sw_SW/recruitment.lang +++ b/htdocs/langs/sw_SW/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Tunaajiri. Hii ni orodha ya nafasi zilizo wazi zitakazojazwa... NoPositionOpen=Hakuna nafasi zilizofunguliwa kwa sasa ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/ta_IN/recruitment.lang b/htdocs/langs/ta_IN/recruitment.lang index c87fb30a8dd..67d5414ac41 100644 --- a/htdocs/langs/ta_IN/recruitment.lang +++ b/htdocs/langs/ta_IN/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/tg_TJ/recruitment.lang b/htdocs/langs/tg_TJ/recruitment.lang index 626ff16c8fc..d4a95b0ecd7 100644 --- a/htdocs/langs/tg_TJ/recruitment.lang +++ b/htdocs/langs/tg_TJ/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=We are recruiting. This is a list of open positions to be filled NoPositionOpen=No positions open at the moment ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/th_TH/recruitment.lang b/htdocs/langs/th_TH/recruitment.lang index f94c2af711b..7e25a0e714f 100644 --- a/htdocs/langs/th_TH/recruitment.lang +++ b/htdocs/langs/th_TH/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=เรากำลังรับสมัครงาน. น NoPositionOpen=ไม่มีตำแหน่งที่เปิดอยู่ในขณะนี้ ConfirmClose=ยืนยันการยกเลิก ConfirmCloseAsk=คุณแน่ใจหรือไม่ว่าต้องการยกเลิกผู้สมัครรับสมัครงานรายนี้ -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang index ef922868afa..68f23abd2de 100644 --- a/htdocs/langs/uk_UA/recruitment.lang +++ b/htdocs/langs/uk_UA/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Ми набираємо. Це список відкритих в NoPositionOpen=На даний момент немає відкритих позицій ConfirmClose=Підтвердити скасування ConfirmCloseAsk=Ви впевнені, що бажаєте скасувати цю кандидатуру на роботу? -recruitment=вербування +Recruitment=вербування diff --git a/htdocs/langs/ur_PK/recruitment.lang b/htdocs/langs/ur_PK/recruitment.lang index cba4420972e..8561062dd19 100644 --- a/htdocs/langs/ur_PK/recruitment.lang +++ b/htdocs/langs/ur_PK/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=ہم بھرتی کر رہے ہیں۔ یہ پُر کیے جانے NoPositionOpen=اس وقت کوئی عہدہ نہیں کھلا ہے۔ ConfirmClose=منسوخی کی تصدیق کریں۔ ConfirmCloseAsk=کیا آپ واقعی اس بھرتی کی امیدواری کو منسوخ کرنا چاہتے ہیں؟ -recruitment=Recruitment +Recruitment=Recruitment diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang index 39f56748602..ddde30427cc 100644 --- a/htdocs/langs/uz_UZ/recruitment.lang +++ b/htdocs/langs/uz_UZ/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Biz ishga qabul qilamiz. Bu to'ldirilishi kerak bo'lgan ochiq la NoPositionOpen=Ayni paytda hech qanday lavozim ochilmagan ConfirmClose=Bekor qilishni tasdiqlang ConfirmCloseAsk=Haqiqatan ham bu ishga yollash nomzodini bekor qilmoqchimisiz -recruitment=Ishga qabul qilish +Recruitment=Ishga qabul qilish diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang index 08ae250f58a..a2bd7748c5e 100644 --- a/htdocs/langs/vi_VN/recruitment.lang +++ b/htdocs/langs/vi_VN/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=Chúng tôi đang tuyển dụng. Đây là danh sách các vị NoPositionOpen=Không có vị trí nào mở vào lúc này ConfirmClose=Xác nhận hủy ConfirmCloseAsk=Bạn có chắc chắn muốn hủy ứng tuyển tuyển dụng này không -recruitment=Tuyển dụng +Recruitment=Tuyển dụng diff --git a/htdocs/langs/zh_CN/recruitment.lang b/htdocs/langs/zh_CN/recruitment.lang index 8801ce46d55..7f16ac0fd57 100644 --- a/htdocs/langs/zh_CN/recruitment.lang +++ b/htdocs/langs/zh_CN/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=我们正在招聘。这是一份有待填补的空缺职位清 NoPositionOpen=暂时没有职位空缺 ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=招聘 +Recruitment=招聘 diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang index 4b253d7467e..093cb87b944 100644 --- a/htdocs/langs/zh_TW/recruitment.lang +++ b/htdocs/langs/zh_TW/recruitment.lang @@ -77,4 +77,4 @@ WeAreRecruiting=我們正在招聘。這是一個待填補的空缺職位清單. NoPositionOpen=暫時沒有職位空缺 ConfirmClose=Confirm cancellation ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature -recruitment=招募 +Recruitment=招募 diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 85b6c5a03a7..dddc2f9630a 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -704,7 +704,7 @@ foreach ($searchCategoryCustomerList as $searchCategoryCustomer) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks $parameters = array('param' => &$param); -$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; // List of mass actions available @@ -1099,7 +1099,7 @@ $parameters = array( 'sortorder' => $sortorder, 'totalarray' => &$totalarray, ); -$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook +$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; if (!empty($arrayfields['t.datec']['checked'])) { print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 3a2309d26b2..75e5c58cc8a 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1382,7 +1382,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser } // Add $param from hooks $parameters = array('param' => &$param); - $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; print '
'; @@ -1578,7 +1578,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser $sql .= " t.invoice_line_id"; // Add fields from hooks $parameters = array(); - $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql = preg_replace('/,\s*$/', '', $sql); @@ -1595,7 +1595,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Add table from hooks $parameters = array(); - $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; $sql .= " WHERE elementtype = 'task'"; $sql .= " AND p.entity IN (".getEntity('project').")"; @@ -1685,7 +1685,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Add where from hooks $parameters = array(); - $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; // Count total nb of records @@ -1782,7 +1782,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser } // Hook fields $parameters = array('mode' => 'create'); - $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; print ''; print "\n"; @@ -1865,7 +1865,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Fields from hook $parameters = array('mode' => 'create'); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; print ''; @@ -1883,7 +1883,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser $moreforfilter = ''; $parameters = array(); - $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { $moreforfilter .= $hookmanager->resPrint; } else { @@ -2001,7 +2001,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser */ // 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, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { @@ -2086,7 +2086,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser */ // 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, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch '); @@ -2461,7 +2461,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Fields from hook $parameters = array('arrayfields' => $arrayfields, 'obj' => $task_time, 'i' => $i, 'totalarray' => &$totalarray); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column @@ -2660,7 +2660,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Fields from hook $parameters = array('arrayfields' => $arrayfields, 'obj' => $task_time, 'mode' => 'split1'); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column @@ -2826,7 +2826,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Fields from hook $parameters = array('arrayfields' => $arrayfields, 'obj' => $task_time, 'mode' => 'split2'); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column @@ -2879,7 +2879,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser } $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); - $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; print ""; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index e969889fe5e..89ddb7179c7 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -1002,7 +1002,7 @@ if ($action == 'create' || $action == 'presend') { $object->ref = $object->id; print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'track_id'); } else { - print $object->track_id; + print dolPrintLabel($object->track_id); } } else { print $langs->trans('None');