Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop

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";
@@ -711,7 +711,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);
@@ -1077,7 +1077,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 {
@@ -1279,7 +1279,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 '<td class="nowraponall center"></td>';
@@ -1853,7 +1853,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

htdocs/core/lib/functions.lib.php

@@ -3087,7 +3087,6 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$morehtmlref = $hookmanager->resPrint;
 	}
 
-
 	print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle centpercent">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';

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';

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';

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 = '';
@@ -1134,7 +1134,7 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= '</div>';
 }
 $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 {
@@ -1272,7 +1272,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'])) {
@@ -1383,7 +1383,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 ');
@@ -1633,7 +1633,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'])) {
@@ -1703,7 +1703,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 "</table>";

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

htdocs/langs/am_ET/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=እየቀጠርን ነው። ይህ የሚሞሉ ክፍት የ
 NoPositionOpen=በአሁኑ ጊዜ ምንም ክፍት ቦታዎች የሉም
 ConfirmClose=መሰረዙን ያረጋግጡ
 ConfirmCloseAsk=እርግጠኛ ነዎት ይህን የምልመላ እጩ መሰረዝ ይፈልጋሉ
-Recruitment=Recruitment
+Recruitment=ምልመላ

htdocs/langs/ar_SA/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=نحن نوظف. هذه قائمة بالوظائف الشاغر
 NoPositionOpen=لا توجد وظائف مفتوحة في الوقت الحالي
 ConfirmClose=تأكيد الالغاء
 ConfirmCloseAsk=هل أنت متأكد أنك تريد إلغاء ترشيح التوظيف هذا
-Recruitment=Recruitment
+Recruitment=توظيف

htdocs/langs/az_AZ/recruitment.lang

@@ -63,4 +63,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=Recruitment
+Recruitment=İşə qəbul

htdocs/langs/bg_BG/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=Ние набираме персонал. Това е списъ
 NoPositionOpen=В момента няма отворени позиции
 ConfirmClose=Потвърдете анулирането
 ConfirmCloseAsk=Сигурни ли сте, че искате, за да отмените тази кандидатура за набиране на персонал
-Recruitment=Recruitment
+Recruitment=подбор на персонал

htdocs/langs/bn_BD/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=আমরা নিয়োগ করছি। এটি পূ
 NoPositionOpen=এই মুহূর্তে কোনো পজিশন খোলা নেই
 ConfirmClose=বাতিল নিশ্চিত করুন
 ConfirmCloseAsk=আপনি কি নিশ্চিত যে আপনি এই নিয়োগের প্রার্থীতা বাতিল করতে চান?
-Recruitment=Recruitment
+Recruitment=নিয়োগ

htdocs/langs/bn_IN/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=আমরা নিয়োগ করছি। এটি পূ
 NoPositionOpen=এই মুহূর্তে কোন পজিশন খোলা নেই
 ConfirmClose=বাতিল নিশ্চিত করুন
 ConfirmCloseAsk=আপনি কি নিশ্চিত যে আপনি এই নিয়োগের প্রার্থীতা বাতিল করতে চান?
-Recruitment=Recruitment
+Recruitment=নিয়োগ

htdocs/langs/bs_BA/recruitment.lang

@@ -63,4 +63,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=Recruitment
+Recruitment=Regrutacija

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

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

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

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

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

htdocs/langs/fi_FI/recruitment.lang

@@ -63,4 +63,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=Recruitment
+Recruitment=Rekrytointi

htdocs/langs/he_IL/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=אנחנו מגייסים. זוהי רשימה של משרות
 NoPositionOpen=אין משרות פתוחות כרגע
 ConfirmClose=אשר את הביטול
 ConfirmCloseAsk=האם אתה בטוח שברצונך לבטל את מועמדות הגיוס הזו
-Recruitment=Recruitment
+Recruitment=גיוס

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

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

htdocs/langs/lo_LA/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=ພວກເຮົາຮັບສະໝັກພະນັກງ
 NoPositionOpen=ບໍ່​ມີ​ຕໍາ​ແຫນ່ງ​ເປີດ​ໃນ​ປັດ​ຈຸ​ບັນ​
 ConfirmClose=ຢືນຢັນການຍົກເລີກ
 ConfirmCloseAsk=ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການຍົກເລີກການສະໝັກຮັບສະໝັກງານນີ້
-Recruitment=Recruitment
+Recruitment=ຮັບສະໝັກພະນັກງານ

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

htdocs/langs/ro_RO/recruitment.lang

@@ -15,7 +15,7 @@
 # Module label 'ModuleRecruitmentName'
 ModuleRecruitmentName = Recrutare personal
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc =  Gestionează și urmărește campaniile de recrutare pentru joburile noi 
+ModuleRecruitmentDesc =  Gestionează și urmărește campaniile de recrutare pentru joburile noi
 # Admin page
 RecruitmentSetup = Configurare modul Recrutare personal
 RecruitmentSetupPage = Introdu aici setările pentru opţiunile principale ale modulului Recrutare personal

htdocs/langs/sk_SK/recruitment.lang

@@ -63,4 +63,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=Recruitment
+Recruitment=Nábor

htdocs/langs/sq_AL/recruitment.lang

@@ -63,4 +63,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=Recruitment
+Recruitment=Rekrutimi

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

htdocs/langs/uk_UA/recruitment.lang

@@ -63,4 +63,4 @@ WeAreRecruiting=Ми набираємо. Це список відкритих в
 NoPositionOpen=На даний момент немає відкритих позицій
 ConfirmClose=Підтвердити скасування
 ConfirmCloseAsk=Ви впевнені, що бажаєте скасувати цю кандидатуру на роботу?
-Recruitment=Recruitment
+Recruitment=вербування

htdocs/langs/uz_UZ/recruitment.lang

@@ -63,4 +63,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=Recruitment
+Recruitment=Ishga qabul qilish

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 ');

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 '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
@@ -1579,7 +1579,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		$sql .= " pt.billable";
 		// 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);
 
@@ -1596,7 +1596,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').")";
@@ -1686,7 +1686,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
@@ -1783,7 +1783,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 '<td></td>';
 			print "</tr>\n";
@@ -1866,7 +1866,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 '<td class="center">';
@@ -1884,7 +1884,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 {
@@ -2002,7 +2002,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')) {
@@ -2087,7 +2087,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 ');
@@ -2468,7 +2468,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
@@ -2677,7 +2677,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
@@ -2843,7 +2843,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
@@ -2896,7 +2896,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 "</table>";

htdocs/ticket/card.php

@@ -1018,7 +1018,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');