alxarafe / alixar

dolibarr/htdocs/core/tpl/bloc_comment.tpl.php

Indentation +55 added lines, -55 removed lines

@@ -3,8 +3,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 // Require
@@ -56,59 +56,59 @@ 
 // List of comments
 if (!empty($object->comments))
 {
-	// Default color for current user
-	$TColors = array($user->id => array('bgcolor'=>'efefef','color'=>'555'));
-	$first = true;
-	foreach($object->comments as $comment)
-	{
-		$fk_user = $comment->fk_user_author;
-		$userstatic->fetch($fk_user);
-
-		if(empty($TColors[$fk_user])) {
-			$bgcolor = random_color(180,240);
-			if(!empty($userstatic->color)) {
-				$bgcolor = $userstatic->color;
-			}
-			$color = (colorIsLight($bgcolor))?'555':'fff';
-			$TColors[$fk_user] = array('bgcolor'=>$bgcolor,'color'=>$color);
-		}
-		print '<div class="width100p" style="color:#'.$TColors[$fk_user]['color'].'">';
-		if ($fk_user != $user->id) {
-			print '<div class="width25p float">&nbsp;</div>';
-		}
-
-		print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
-		print '<div class="comment-info comment-cell">';
-		if (! empty($user->photo))
-		{
-			print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
-		}
-		print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
-		print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
-		print '</div>'; // End comment-info
-
-		print '<div class="comment-cell comment-right">';
-		print '<div class="comment-table width100p">';
-		print '<div class="comment-description comment-cell">';
-		print $comment->description;
-		print '</div>'; // End comment-description
-		if(($first && $fk_user == $user->id) || $user->admin == 1) {
-			print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
-			print img_picto('', 'delete.png');
-			print '</a>';
-		}
-		print '</div>'; // End comment-table
-		print '</div>'; // End comment-right
-		print '</div>'; // End comment
-
-		if($fk_user == $user->id) {
-			print '<div class="width25p float">&nbsp;</div>';
-		}
-		print '<div class="clearboth"></div>';
-		print '</div>'; // end 100p
-
-		$first = false;
-	}
+    // Default color for current user
+    $TColors = array($user->id => array('bgcolor'=>'efefef','color'=>'555'));
+    $first = true;
+    foreach($object->comments as $comment)
+    {
+        $fk_user = $comment->fk_user_author;
+        $userstatic->fetch($fk_user);
+
+        if(empty($TColors[$fk_user])) {
+            $bgcolor = random_color(180,240);
+            if(!empty($userstatic->color)) {
+                $bgcolor = $userstatic->color;
+            }
+            $color = (colorIsLight($bgcolor))?'555':'fff';
+            $TColors[$fk_user] = array('bgcolor'=>$bgcolor,'color'=>$color);
+        }
+        print '<div class="width100p" style="color:#'.$TColors[$fk_user]['color'].'">';
+        if ($fk_user != $user->id) {
+            print '<div class="width25p float">&nbsp;</div>';
+        }
+
+        print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
+        print '<div class="comment-info comment-cell">';
+        if (! empty($user->photo))
+        {
+            print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
+        }
+        print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
+        print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
+        print '</div>'; // End comment-info
+
+        print '<div class="comment-cell comment-right">';
+        print '<div class="comment-table width100p">';
+        print '<div class="comment-description comment-cell">';
+        print $comment->description;
+        print '</div>'; // End comment-description
+        if(($first && $fk_user == $user->id) || $user->admin == 1) {
+            print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
+            print img_picto('', 'delete.png');
+            print '</a>';
+        }
+        print '</div>'; // End comment-table
+        print '</div>'; // End comment-right
+        print '</div>'; // End comment
+
+        if($fk_user == $user->id) {
+            print '<div class="width25p float">&nbsp;</div>';
+        }
+        print '<div class="clearboth"></div>';
+        print '</div>'; // end 100p
+
+        $first = false;
+    }
 }
 
 print '<br>';

dolibarr/htdocs/core/tpl/advtarget.tpl.php

Indentation +475 added lines, -475 removed lines

@@ -47,484 +47,484 @@
 </script>';
 
 
-		print_fiche_titre($langs->trans("AdvTgtTitle"));
-
-		print '<div class="tabBar">' . "\n";
-		print '<form name="find_customer" id="find_customer" action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '"  method="POST">' . "\n";
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
-		print '<input type="hidden" name="action" value="">' . "\n";
-		print '<table class="border" width="100%">' . "\n";
-
-		print '<tr>' . "\n";
-		print '<td colspan="3" align="right">' . "\n";
-
-		print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
-
-		print '</td>' . "\n";
-		print '</tr>' . "\n";
-
-		print '<tr><td>' . $langs->trans('AdvTgtNameTemplate') . '</td><td>';
-		if (! empty($template_id)) {
-			$default_template = $template_id;
-		} else {
-			$default_template = $advTarget->id;
-		}
-		print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template,0,$advTarget->type_element);
-		print '<input type="button" name="loadfilter" id="loadfilter" value="' . $langs->trans('AdvTgtLoadFilter') . '" class="butAction"/>';
-		print '<input type="button" name="deletefilter" id="deletefilter" value="' . $langs->trans('AdvTgtDeleteFilter') . '" class="butAction"/>';
-		print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
-		print $langs->trans('AdvTgtOrCreateNewFilter');
-		print '<input type="text" name="template_name" id="template_name" value=""/>';
-		print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		print '<tr><td>' . $langs->trans('AdvTgtTypeOfIncude') . '</td><td>';
-		print $form->selectarray('type_of_target', $advTarget->select_target_type, $array_query['type_of_target']);
-		print '</td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtTypeOfIncudeHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Customer name
-		print '<tr><td>' . $langs->trans('ThirdPartyName');
-		if (! empty($array_query['cust_name'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_name" value="' . $array_query['cust_name'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Code Client
-		print '<tr><td>' . $langs->trans('CustomerCode');
-		if (! empty($array_query['cust_code'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_code" value="' . $array_query['cust_code'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Address Client
-		print '<tr><td>' . $langs->trans('Address');
-		if (! empty($array_query['cust_adress'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_adress" value="' . $array_query['cust_adress'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Zip Client
-		print '<tr><td>' . $langs->trans('Zip');
-		if (! empty($array_query['cust_zip'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_zip" value="' . $array_query['cust_zip'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// City Client
-		print '<tr><td>' . $langs->trans('Town');
-		if (! empty($array_query['cust_city'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_city" value="' . $array_query['cust_city'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Customer Country
-		print '<tr><td>' . $langs->trans("Country");
-		if (count($array_query['cust_country']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->multiselectCountry('cust_country', $array_query['cust_country']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// State Customer
-		print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('ThirdParty');
-		if (count($array_query['cust_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('cust_status', array (
-				'0' => $langs->trans('ActivityCeased'),
-				'1' => $langs->trans('InActivity')
-		), $array_query['cust_status']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Mother Company
-		print '<tr><td>' . $langs->trans("Maison mère");
-		if (! empty($array_query['cust_mothercompany'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print '<input type="text" name="cust_mothercompany" value="' . $array_query['cust_mothercompany'] . '"/>';
-		print '</td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Prospect/Customer
-		$selected = $array_query['cust_typecust'];
-		print '<tr><td>' . $langs->trans('ProspectCustomer') . ' ' . $langs->trans('ThirdParty');
-		if (count($array_query['cust_typecust']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		$options_array = array (
-				2 => $langs->trans('Prospect'),
-				3 => $langs->trans('ProspectCustomer'),
-				1 => $langs->trans('Customer'),
-				0 => $langs->trans('NorProspectNorCustomer')
-		);
-		print $formadvtargetemaling->advMultiselectarray('cust_typecust', $options_array, $array_query['cust_typecust']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Prospection status
-		print '<tr><td>' . $langs->trans('ProspectLevel');
-		if (count($array_query['cust_prospect_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Prospection comm status
-		print '<tr><td>' . $langs->trans('StatusProsp');
-		if (count($array_query['cust_comm_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('cust_comm_status', $advTarget->type_statuscommprospect, $array_query['cust_comm_status']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Customer Type
-		print '<tr><td>' . $langs->trans("ThirdPartyType");
-		if (count($array_query['cust_typeent']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->advMultiselectarray('cust_typeent', $formcompany->typent_array(0, " AND id <> 0"), $array_query['cust_typeent']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Staff number
-		print '<td>' . $langs->trans("Staff");
-		if (count($array_query['cust_effectif_id']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray("cust_effectif_id", $formcompany->effectif_array(0, " AND id <> 0"), $array_query['cust_effectif_id']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Sales manager
-		print '<tr><td>' . $langs->trans("SalesRepresentatives");
-		if (count($array_query['cust_saleman']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman', $array_query['cust_saleman'], $user);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Customer Default Langauge
-		if (! empty($conf->global->MAIN_MULTILANGS)) {
-
-			print '<tr><td>' . $langs->trans("DefaultLang");
-			if (count($array_query['cust_language']) > 0) {
-				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-			}
-			print '</td><td>' . "\n";
-			print $formadvtargetemaling->multiselectselectLanguage('cust_language', $array_query['cust_language']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
-		}
-
-		if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
-			// Customer Categories
-			print '<tr><td>' . $langs->trans("CustomersCategoryShort");
-			if (count($array_query['cust_categ']) > 0) {
-				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-			}
-			print '</td><td>' . "\n";
-			print $formadvtargetemaling->multiselectCustomerCategories('cust_categ', $array_query['cust_categ']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
-		}
-
-		// Standard Extrafield feature
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
-			// fetch optionals attributes and labels
-			dol_include_once('/core/class/extrafields.class.php');
-			$extrafields = new ExtraFields($db);
-			$extralabels = $extrafields->fetch_name_optionals_label('societe');
-			foreach ( $extralabels as $key => $val ) {
-				if ($key != 'ts_nameextra' && $key != 'ts_payeur') {
-					print '<tr><td>' . $extrafields->attribute_label[$key];
-					if (! empty($array_query['options_' . $key]) || (is_array($array_query['options_' . $key]) && count($array_query['options_' . $key]) > 0)) {
-						print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-					}
-					print '</td><td>';
-					if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
-						print '<input type="text" name="options_' . $key . '"/></td><td>' . "\n";
-						print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-					} elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
-						print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options' . $key . '_min"/>';
-						print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options' . $key . '_max"/>';
-						print '</td><td>' . "\n";
-						print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
-					} elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
-
-						print '<table class="nobordernopadding"><tr>';
-						print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-						print $form->selectDate('', 'options_' . $key . '_st_dt');
-						print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-						print $form->selectDate('', 'options_' . $key . '_end_dt');
-						print '</td></tr></table>';
-
-						print '</td><td>' . "\n";
-						print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
-					} elseif (($extrafields->attribute_type[$key] == 'boolean')) {
-						print $form->selectarray('options_' . $key, array (
-								'' => '',
-								'1' => $langs->trans('Yes'),
-								'0' => $langs->trans('No')
-						), $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
-					} elseif (($extrafields->attribute_type[$key] == 'select')) {
-						print $formadvtargetemaling->advMultiselectarray('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
-					} elseif (($extrafields->attribute_type[$key] == 'sellist')) {
-						print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
-					} else {
-
-						print '<table class="nobordernopadding"><tr>';
-						print '<td></td><td>';
-						if (is_array($array_query['options_' . $key])) {
-							print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key]));
-						} else {
-							print $extrafields->showInputField($key, $array_query['options_' . $key]);
-						}
-						print '</td></tr></table>';
-
-						print '</td><td>' . "\n";
-					}
-					print '</td></tr>' . "\n";
-				}
-			}
-		} else {
-			$std_soc = new Societe($db);
-			$action_search = 'query';
-
-			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
-			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array ('thirdpartycard'));
-
-			$parameters=array();
-			if (! empty($advTarget->id)) {
-				$parameters = array('array_query' => $advTarget->filtervalue);
-			}
-			// Other attributes
-			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
+        print_fiche_titre($langs->trans("AdvTgtTitle"));
+
+        print '<div class="tabBar">' . "\n";
+        print '<form name="find_customer" id="find_customer" action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '"  method="POST">' . "\n";
+        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
+        print '<input type="hidden" name="action" value="">' . "\n";
+        print '<table class="border" width="100%">' . "\n";
+
+        print '<tr>' . "\n";
+        print '<td colspan="3" align="right">' . "\n";
+
+        print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
+
+        print '</td>' . "\n";
+        print '</tr>' . "\n";
+
+        print '<tr><td>' . $langs->trans('AdvTgtNameTemplate') . '</td><td>';
+        if (! empty($template_id)) {
+            $default_template = $template_id;
+        } else {
+            $default_template = $advTarget->id;
+        }
+        print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template,0,$advTarget->type_element);
+        print '<input type="button" name="loadfilter" id="loadfilter" value="' . $langs->trans('AdvTgtLoadFilter') . '" class="butAction"/>';
+        print '<input type="button" name="deletefilter" id="deletefilter" value="' . $langs->trans('AdvTgtDeleteFilter') . '" class="butAction"/>';
+        print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
+        print $langs->trans('AdvTgtOrCreateNewFilter');
+        print '<input type="text" name="template_name" id="template_name" value=""/>';
+        print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        print '<tr><td>' . $langs->trans('AdvTgtTypeOfIncude') . '</td><td>';
+        print $form->selectarray('type_of_target', $advTarget->select_target_type, $array_query['type_of_target']);
+        print '</td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtTypeOfIncudeHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Customer name
+        print '<tr><td>' . $langs->trans('ThirdPartyName');
+        if (! empty($array_query['cust_name'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_name" value="' . $array_query['cust_name'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Code Client
+        print '<tr><td>' . $langs->trans('CustomerCode');
+        if (! empty($array_query['cust_code'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_code" value="' . $array_query['cust_code'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Address Client
+        print '<tr><td>' . $langs->trans('Address');
+        if (! empty($array_query['cust_adress'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_adress" value="' . $array_query['cust_adress'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Zip Client
+        print '<tr><td>' . $langs->trans('Zip');
+        if (! empty($array_query['cust_zip'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_zip" value="' . $array_query['cust_zip'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // City Client
+        print '<tr><td>' . $langs->trans('Town');
+        if (! empty($array_query['cust_city'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_city" value="' . $array_query['cust_city'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Customer Country
+        print '<tr><td>' . $langs->trans("Country");
+        if (count($array_query['cust_country']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->multiselectCountry('cust_country', $array_query['cust_country']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // State Customer
+        print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('ThirdParty');
+        if (count($array_query['cust_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray('cust_status', array (
+                '0' => $langs->trans('ActivityCeased'),
+                '1' => $langs->trans('InActivity')
+        ), $array_query['cust_status']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Mother Company
+        print '<tr><td>' . $langs->trans("Maison mère");
+        if (! empty($array_query['cust_mothercompany'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print '<input type="text" name="cust_mothercompany" value="' . $array_query['cust_mothercompany'] . '"/>';
+        print '</td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Prospect/Customer
+        $selected = $array_query['cust_typecust'];
+        print '<tr><td>' . $langs->trans('ProspectCustomer') . ' ' . $langs->trans('ThirdParty');
+        if (count($array_query['cust_typecust']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        $options_array = array (
+                2 => $langs->trans('Prospect'),
+                3 => $langs->trans('ProspectCustomer'),
+                1 => $langs->trans('Customer'),
+                0 => $langs->trans('NorProspectNorCustomer')
+        );
+        print $formadvtargetemaling->advMultiselectarray('cust_typecust', $options_array, $array_query['cust_typecust']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Prospection status
+        print '<tr><td>' . $langs->trans('ProspectLevel');
+        if (count($array_query['cust_prospect_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Prospection comm status
+        print '<tr><td>' . $langs->trans('StatusProsp');
+        if (count($array_query['cust_comm_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray('cust_comm_status', $advTarget->type_statuscommprospect, $array_query['cust_comm_status']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Customer Type
+        print '<tr><td>' . $langs->trans("ThirdPartyType");
+        if (count($array_query['cust_typeent']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->advMultiselectarray('cust_typeent', $formcompany->typent_array(0, " AND id <> 0"), $array_query['cust_typeent']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Staff number
+        print '<td>' . $langs->trans("Staff");
+        if (count($array_query['cust_effectif_id']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray("cust_effectif_id", $formcompany->effectif_array(0, " AND id <> 0"), $array_query['cust_effectif_id']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Sales manager
+        print '<tr><td>' . $langs->trans("SalesRepresentatives");
+        if (count($array_query['cust_saleman']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman', $array_query['cust_saleman'], $user);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Customer Default Langauge
+        if (! empty($conf->global->MAIN_MULTILANGS)) {
+
+            print '<tr><td>' . $langs->trans("DefaultLang");
+            if (count($array_query['cust_language']) > 0) {
+                print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+            }
+            print '</td><td>' . "\n";
+            print $formadvtargetemaling->multiselectselectLanguage('cust_language', $array_query['cust_language']);
+            print '</td><td>' . "\n";
+            print '</td></tr>' . "\n";
+        }
+
+        if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+            // Customer Categories
+            print '<tr><td>' . $langs->trans("CustomersCategoryShort");
+            if (count($array_query['cust_categ']) > 0) {
+                print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+            }
+            print '</td><td>' . "\n";
+            print $formadvtargetemaling->multiselectCustomerCategories('cust_categ', $array_query['cust_categ']);
+            print '</td><td>' . "\n";
+            print '</td></tr>' . "\n";
+        }
+
+        // Standard Extrafield feature
+        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            // fetch optionals attributes and labels
+            dol_include_once('/core/class/extrafields.class.php');
+            $extrafields = new ExtraFields($db);
+            $extralabels = $extrafields->fetch_name_optionals_label('societe');
+            foreach ( $extralabels as $key => $val ) {
+                if ($key != 'ts_nameextra' && $key != 'ts_payeur') {
+                    print '<tr><td>' . $extrafields->attribute_label[$key];
+                    if (! empty($array_query['options_' . $key]) || (is_array($array_query['options_' . $key]) && count($array_query['options_' . $key]) > 0)) {
+                        print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+                    }
+                    print '</td><td>';
+                    if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
+                        print '<input type="text" name="options_' . $key . '"/></td><td>' . "\n";
+                        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+                    } elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
+                        print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options' . $key . '_min"/>';
+                        print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options' . $key . '_max"/>';
+                        print '</td><td>' . "\n";
+                        print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
+                    } elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
+
+                        print '<table class="nobordernopadding"><tr>';
+                        print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+                        print $form->selectDate('', 'options_' . $key . '_st_dt');
+                        print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+                        print $form->selectDate('', 'options_' . $key . '_end_dt');
+                        print '</td></tr></table>';
+
+                        print '</td><td>' . "\n";
+                        print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
+                    } elseif (($extrafields->attribute_type[$key] == 'boolean')) {
+                        print $form->selectarray('options_' . $key, array (
+                                '' => '',
+                                '1' => $langs->trans('Yes'),
+                                '0' => $langs->trans('No')
+                        ), $array_query['options_' . $key]);
+                        print '</td><td>' . "\n";
+                    } elseif (($extrafields->attribute_type[$key] == 'select')) {
+                        print $formadvtargetemaling->advMultiselectarray('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
+                        print '</td><td>' . "\n";
+                    } elseif (($extrafields->attribute_type[$key] == 'sellist')) {
+                        print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
+                        print '</td><td>' . "\n";
+                    } else {
+
+                        print '<table class="nobordernopadding"><tr>';
+                        print '<td></td><td>';
+                        if (is_array($array_query['options_' . $key])) {
+                            print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key]));
+                        } else {
+                            print $extrafields->showInputField($key, $array_query['options_' . $key]);
+                        }
+                        print '</td></tr></table>';
+
+                        print '</td><td>' . "\n";
+                    }
+                    print '</td></tr>' . "\n";
+                }
+            }
+        } else {
+            $std_soc = new Societe($db);
+            $action_search = 'query';
+
+            // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+            include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+            $hookmanager = new HookManager($db);
+            $hookmanager->initHooks(array ('thirdpartycard'));
+
+            $parameters=array();
+            if (! empty($advTarget->id)) {
+                $parameters = array('array_query' => $advTarget->filtervalue);
+            }
+            // Other attributes
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
             print $hookmanager->resPrint;
-		}
-
-		// State Contact
-		print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('Contact');
-		if (count($array_query['contact_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('contact_status', array (
-				'0' => $langs->trans('ActivityCeased'),
-				'1' => $langs->trans('InActivity')
-		), $array_query['contact_status']);
-		print '</td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Civility
-		print '<tr><td width="15%">' . $langs->trans("UserTitle");
-		if (count($array_query['contact_civility']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->multiselectCivility('contact_civility', $array_query['contact_civility']);
-		print '</td></tr>';
-
-		// contact name
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Lastname');
-		if (! empty($array_query['contact_lastname'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="contact_lastname" value="' . $array_query['contact_lastname'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Firstname');
-		if (! empty($array_query['contact_firstname'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="contact_firstname" value="' . $array_query['contact_firstname'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Contact Country
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("Country");
-		if (count($array_query['contact_country']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->multiselectCountry('contact_country', $array_query['contact_country']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Never send mass mailing
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("No_Email");
-		if (! empty($array_query['contact_no_email'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $form->selectarray('contact_no_email', array (
-				'' => '',
-				'1' => $langs->trans('Yes'),
-				'0' => $langs->trans('No')
-		), $array_query['contact_no_email']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Contact Date Create
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateCreation");
-		if (! empty($array_query['contact_create_st_dt'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print '<table class="nobordernopadding"><tr>';
-		print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_create_st_dt'], 'contact_create_st_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_create_end_dt'], 'contact_create_end_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td></tr></table>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Contact update Create
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateLastModification");
-		if (! empty($array_query['contact_update_st_dt'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print '<table class="nobordernopadding"><tr>';
-		print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_update_st_dt'], 'contact_update_st_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_update_end_dt'], 'contact_update_end_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td></tr></table>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
-			// Customer Categories
-			print '<tr><td>' . $langs->trans("ContactCategoriesShort");
-			if (count($array_query['contact_categ']) > 0) {
-				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-			}
-			print '</td><td>' . "\n";
-			print $formadvtargetemaling->multiselectContactCategories('contact_categ', $array_query['contact_categ']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
-		}
-
-		// Standard Extrafield feature
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
-			// fetch optionals attributes and labels
-			dol_include_once('/core/class/extrafields.class.php');
-			$extrafields = new ExtraFields($db);
-			$extralabels = $extrafields->fetch_name_optionals_label('socpeople');
+        }
+
+        // State Contact
+        print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('Contact');
+        if (count($array_query['contact_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray('contact_status', array (
+                '0' => $langs->trans('ActivityCeased'),
+                '1' => $langs->trans('InActivity')
+        ), $array_query['contact_status']);
+        print '</td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Civility
+        print '<tr><td width="15%">' . $langs->trans("UserTitle");
+        if (count($array_query['contact_civility']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->multiselectCivility('contact_civility', $array_query['contact_civility']);
+        print '</td></tr>';
+
+        // contact name
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Lastname');
+        if (! empty($array_query['contact_lastname'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="contact_lastname" value="' . $array_query['contact_lastname'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Firstname');
+        if (! empty($array_query['contact_firstname'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="contact_firstname" value="' . $array_query['contact_firstname'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Contact Country
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("Country");
+        if (count($array_query['contact_country']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->multiselectCountry('contact_country', $array_query['contact_country']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Never send mass mailing
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("No_Email");
+        if (! empty($array_query['contact_no_email'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $form->selectarray('contact_no_email', array (
+                '' => '',
+                '1' => $langs->trans('Yes'),
+                '0' => $langs->trans('No')
+        ), $array_query['contact_no_email']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Contact Date Create
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateCreation");
+        if (! empty($array_query['contact_create_st_dt'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print '<table class="nobordernopadding"><tr>';
+        print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_create_st_dt'], 'contact_create_st_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_create_end_dt'], 'contact_create_end_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td></tr></table>';
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Contact update Create
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateLastModification");
+        if (! empty($array_query['contact_update_st_dt'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print '<table class="nobordernopadding"><tr>';
+        print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_update_st_dt'], 'contact_update_st_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_update_end_dt'], 'contact_update_end_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td></tr></table>';
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+            // Customer Categories
+            print '<tr><td>' . $langs->trans("ContactCategoriesShort");
+            if (count($array_query['contact_categ']) > 0) {
+                print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+            }
+            print '</td><td>' . "\n";
+            print $formadvtargetemaling->multiselectContactCategories('contact_categ', $array_query['contact_categ']);
+            print '</td><td>' . "\n";
+            print '</td></tr>' . "\n";
+        }
+
+        // Standard Extrafield feature
+        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            // fetch optionals attributes and labels
+            dol_include_once('/core/class/extrafields.class.php');
+            $extrafields = new ExtraFields($db);
+            $extralabels = $extrafields->fetch_name_optionals_label('socpeople');
             foreach($extrafields->attribute_type as $key=>&$value) {
                 if($value == 'radio')$value = 'select';
             }
 
 
-			foreach ( $extralabels as $key => $val ) {
-
-				print '<tr><td>' . $extrafields->attribute_label[$key];
-				if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
-					print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-				}
-				print '</td><td>';
-				if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
-					print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
-					print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-				} elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
-					print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
-					print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
-					print '</td><td>' . "\n";
-					print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
-				} elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
-
-					print '<table class="nobordernopadding"><tr>';
-					print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-					print $form->selectDate('', 'options_' . $key . '_st_dt' . '_cnct');
-					print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-					print $form->selectDate('', 'options_' . $key . '_end_dt' . '_cnct');
-					print '</td></tr></table>';
-
-					print '</td><td>' . "\n";
-					print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
-				} elseif (($extrafields->attribute_type[$key] == 'boolean')) {
-					print $form->selectarray('options_' . $key . '_cnct', array (
-							'' => '',
-							'1' => $langs->trans('Yes'),
-							'0' => $langs->trans('No')
-					), $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
-				} elseif (($extrafields->attribute_type[$key] == 'select')) {
-					print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
-				} elseif (($extrafields->attribute_type[$key] == 'sellist')) {
-					print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
-				} else {
-
-					print '<table class="nobordernopadding"><tr>';
-					print '<td></td><td>';
-					if (is_array($array_query['options_' . $key . '_cnct'])) {
-						print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
-					} else {
-						print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
-					}
-					print '</td></tr></table>';
-
-					print '</td><td>' . "\n";
-				}
-				print '</td></tr>' . "\n";
-			}
-		}
-
-		print '<tr>' . "\n";
-		print '<td colspan="3" align="right">' . "\n";
-
-		print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
-
-		print '</td>' . "\n";
-		print '</tr>' . "\n";
-		print '</table>' . "\n";
-		print '</form>' . "\n";
-		print '</div>' . "\n";
-
-		print '<form action="' . $_SERVER['PHP_SELF'] . '?action=clear&id=' . $object->id . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-		print_titre($langs->trans("ToClearAllRecipientsClickHere"));
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre" align="right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
-		print '</tr>';
-		print '</table>';
-		print '</form>';
-		print '<br>';
\ No newline at end of file
+            foreach ( $extralabels as $key => $val ) {
+
+                print '<tr><td>' . $extrafields->attribute_label[$key];
+                if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
+                    print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+                }
+                print '</td><td>';
+                if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
+                    print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
+                    print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+                } elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
+                    print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
+                    print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
+                    print '</td><td>' . "\n";
+                    print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
+                } elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
+
+                    print '<table class="nobordernopadding"><tr>';
+                    print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+                    print $form->selectDate('', 'options_' . $key . '_st_dt' . '_cnct');
+                    print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+                    print $form->selectDate('', 'options_' . $key . '_end_dt' . '_cnct');
+                    print '</td></tr></table>';
+
+                    print '</td><td>' . "\n";
+                    print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
+                } elseif (($extrafields->attribute_type[$key] == 'boolean')) {
+                    print $form->selectarray('options_' . $key . '_cnct', array (
+                            '' => '',
+                            '1' => $langs->trans('Yes'),
+                            '0' => $langs->trans('No')
+                    ), $array_query['options_' . $key . '_cnct']);
+                    print '</td><td>' . "\n";
+                } elseif (($extrafields->attribute_type[$key] == 'select')) {
+                    print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
+                    print '</td><td>' . "\n";
+                } elseif (($extrafields->attribute_type[$key] == 'sellist')) {
+                    print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
+                    print '</td><td>' . "\n";
+                } else {
+
+                    print '<table class="nobordernopadding"><tr>';
+                    print '<td></td><td>';
+                    if (is_array($array_query['options_' . $key . '_cnct'])) {
+                        print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
+                    } else {
+                        print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
+                    }
+                    print '</td></tr></table>';
+
+                    print '</td><td>' . "\n";
+                }
+                print '</td></tr>' . "\n";
+            }
+        }
+
+        print '<tr>' . "\n";
+        print '<td colspan="3" align="right">' . "\n";
+
+        print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
+
+        print '</td>' . "\n";
+        print '</tr>' . "\n";
+        print '</table>' . "\n";
+        print '</form>' . "\n";
+        print '</div>' . "\n";
+
+        print '<form action="' . $_SERVER['PHP_SELF'] . '?action=clear&id=' . $object->id . '" method="POST">';
+        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        print_titre($langs->trans("ToClearAllRecipientsClickHere"));
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td class="liste_titre" align="right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
+        print '</tr>';
+        print '</table>';
+        print '</form>';
+        print '<br>';
\ No newline at end of file

dolibarr/htdocs/core/tpl/filemanager.tpl.php

Indentation +50 added lines, -50 removed lines

@@ -21,8 +21,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page filemanager.tpl.php can't be called as URL";
-	exit;
+    print "Error, template page filemanager.tpl.php can't be called as URL";
+    exit;
 }
 
 ?>
@@ -41,15 +41,15 @@ 
 $showroot = 0;
 if ($module == 'ecm')
 {
-	$permtoadd = $user->rights->ecm->setup;
-	$permtoupload = $user->rights->ecm->upload;
-	$showroot = 0;
+    $permtoadd = $user->rights->ecm->setup;
+    $permtoupload = $user->rights->ecm->upload;
+    $showroot = 0;
 }
 if ($module == 'medias')
 {
-	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
-	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
-	$showroot = 1;
+    $permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
+    $permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
+    $showroot = 1;
 }
 
 
@@ -57,8 +57,8 @@ 
 // Confirm remove file (for non javascript users)
 if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax))
 {
-	// TODO Add website, pageid, filemanager if defined
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+    // TODO Add website, pageid, filemanager if defined
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
 }
 
 // Start container of all panels
@@ -74,7 +74,7 @@ 
 // Toolbar
 if ($permtoadd)
 {
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+    print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
 }
@@ -86,10 +86,10 @@ 
 }
 if ($module == 'ecm')
 {
-	$tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;module='.$module:'').($section?'&amp;section='.$section:'')));
-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
-	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
-	print '</a>';
+    $tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;module='.$module:'').($section?'&amp;section='.$section:'')));
+    print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
+    print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
+    print '</a>';
 }
 
 // Start "Add new file" area
@@ -100,20 +100,20 @@ 
 // To attach new file
 if ((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || ! empty($section))
 {
-	if ((empty($section) || $section == -1) && ($module != 'medias'))
-	{
-		?>
+    if ((empty($section) || $section == -1) && ($module != 'medias'))
+    {
+        ?>
 		<script type="text/javascript">
     	jQuery(document).ready(function() {
 			jQuery('#<?php echo $nameforformuserfile ?>').hide();
     	});
     	</script>
 		<?php
-	}
+    }
 
-	$sectiondir=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
-	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+    $sectiondir=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
+    print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile=new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
 }
@@ -143,39 +143,39 @@ 
 
 if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
 {
-	$langs->load("ecm");
+    $langs->load("ecm");
 
-	print '<table width="100%" class="liste noborderbottom">'."\n";
+    print '<table width="100%" class="liste noborderbottom">'."\n";
 
-	print '<!-- Title for manual directories -->'."\n";
-	print '<tr class="liste_titre">'."\n";
+    print '<!-- Title for manual directories -->'."\n";
+    print '<tr class="liste_titre">'."\n";
     print '<th class="liste_titre" align="left">';
     print '&nbsp;'.$langs->trans("ECMSections");
-	print '</th></tr>';
+    print '</th></tr>';
 
     $showonrightsize='';
 
-	// Manual section
-	$htmltooltip=$langs->trans("ECMAreaDesc2");
+    // Manual section
+    $htmltooltip=$langs->trans("ECMAreaDesc2");
 
     if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
     {
-    	// Show the link to "Root"
-    	if ($showroot)
-    	{
-    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">'.$langs->trans("Root").'</a></div></td></tr>';
-    	}
+        // Show the link to "Root"
+        if ($showroot)
+        {
+            print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">'.$langs->trans("Root").'</a></div></td></tr>';
+        }
 
 
 
-    	print '<tr><td>';
+        print '<tr><td>';
 
-    	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
-	    print '<div id="filetree" class="ecmfiletree"></div>';
+        // Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
+        print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+        if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
-	    print '</td></tr>';
+        print '</td></tr>';
     }
     else	// Show filtree when ajax is disabled (rare)
     {
@@ -195,12 +195,12 @@ 
         if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
         include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
-    	print '</div>';
-    	print '</td></tr>';
+        print '</div>';
+        print '</td></tr>';
     }
 
 
-	print "</table>";
+    print "</table>";
 }
 
 
@@ -231,14 +231,14 @@ 
 
 if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
 {
-	//var_dump($modulepart);
-	// Variables that may be defined:
-	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
-	// $_POST['dir']
-	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
-
-	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
+    //var_dump($modulepart);
+    // Variables that may be defined:
+    // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
+    // $_POST['dir']
+    // $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
+    if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
+
+    include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }
 
 ?>

dolibarr/htdocs/core/tpl/commonfields_view.tpl.php

Indentation +43 added lines, -43 removed lines

@@ -26,8 +26,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 if (! is_object($form)) $form=new Form($db);
 
@@ -39,29 +39,29 @@ 
 
 foreach($object->fields as $key => $val)
 {
-	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+    // Discard if extrafield is a hidden field on form
+    if (abs($val['visible']) != 1) continue;
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+    if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
+    if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
 
-	$value=$object->$key;
+    $value=$object->$key;
 
-	print '<tr><td';
-	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
-	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
-	print '</td>';
-	print '<td>';
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
-	print '</td>';
-	print '</tr>';
+    print '<tr><td';
+    print ' class="titlefield';
+    if ($val['notnull'] > 0) print ' fieldrequired';
+    if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+    print '">';
+    if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+    else print $langs->trans($val['label']);
+    print '</td>';
+    print '<td>';
+    print $object->showOutputField($val, $key, $value, '', '', '', 0);
+    //print dol_escape_htmltag($object->$key, 1, 1);
+    print '</td>';
+    print '</tr>';
 
-	if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
+    if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
 }
 
 print '</table>';
@@ -74,31 +74,31 @@ 
 $alreadyoutput = 1;
 foreach($object->fields as $key => $val)
 {
-	if ($alreadyoutput)
-	{
-		if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
-		continue;
-	}
+    if ($alreadyoutput)
+    {
+        if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
+        continue;
+    }
 
-	if (abs($val['visible']) != 1) continue;	// Discard such field from form
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+    if (abs($val['visible']) != 1) continue;	// Discard such field from form
+    if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
+    if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
 
-	$value=$object->$key;
+    $value=$object->$key;
 
-	print '<tr><td';
-	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
-	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
-	print '</td>';
-	print '<td>';
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
-	print '</td>';
-	print '</tr>';
+    print '<tr><td';
+    print ' class="titlefield';
+    if ($val['notnull'] > 0) print ' fieldrequired';
+    if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+    print '">';
+    if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+    else print $langs->trans($val['label']);
+    print '</td>';
+    print '<td>';
+    print $object->showOutputField($val, $key, $value, '', '', '', 0);
+    //print dol_escape_htmltag($object->$key, 1, 1);
+    print '</td>';
+    print '</tr>';
 }
 
 ?>

dolibarr/htdocs/core/tpl/objectline_view.tpl.php

Indentation +146 added lines, -146 removed lines

@@ -40,8 +40,8 @@ 
 // Protection to avoid direct call of template
 if (empty($object) || ! is_object($object))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -72,126 +72,126 @@ 
 	<?php } ?>
 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php echo $line->id; ?>"></div>
 	<?php
-	if (($line->info_bits & 2) == 2) {
-	?>
+    if (($line->info_bits & 2) == 2) {
+    ?>
 		<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
 		<?php
-		$txt='';
-		print img_object($langs->trans("ShowReduc"),'reduc').' ';
-		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
-		//else $txt=$langs->trans("Discount");
-		print $txt;
-		?>
+        $txt='';
+        print img_object($langs->trans("ShowReduc"),'reduc').' ';
+        if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
+        elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+        elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+        //else $txt=$langs->trans("Discount");
+        print $txt;
+        ?>
 		</a>
 		<?php
-		if ($line->description)
-		{
-			if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
-				// Add date of deposit
-				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-				    echo ' ('.dol_print_date($discount->datec).')';
-			}
-			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
-			{
-				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
-			}
-		}
-	}
-	else
-	{
-		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
+        if ($line->description)
+        {
+            if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+            }
+            elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+                // Add date of deposit
+                if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
+                    echo ' ('.dol_print_date($discount->datec).')';
+            }
+            elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+            }
+            elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+            }
+            else
+            {
+                echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
+            }
+        }
+    }
+    else
+    {
+        $format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
 
-	    if ($line->fk_product > 0)
-		{
-			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-		}
-		else
-		{
-			if ($type==1) $text = img_object($langs->trans('Service'),'service');
-			else $text = img_object($langs->trans('Product'),'product');
+        if ($line->fk_product > 0)
+        {
+            echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+        }
+        else
+        {
+            if ($type==1) $text = img_object($langs->trans('Service'),'service');
+            else $text = img_object($langs->trans('Product'),'product');
 
-			if (! empty($line->label)) {
-				$text.= ' <strong>'.$line->label.'</strong>';
-				echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-			} else {
-				if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
-				echo $text.' '.dol_htmlentitiesbr($line->description);
-			}
-		}
+            if (! empty($line->label)) {
+                $text.= ' <strong>'.$line->label.'</strong>';
+                echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+            } else {
+                if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+                echo $text.' '.dol_htmlentitiesbr($line->description);
+            }
+        }
 
-		// Show date range
-		if ($line->element == 'facturedetrec') {
-			if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
-			if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
-			if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
-			if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
-			if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
-		}
-		else {
-			if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
-			//echo get_date_range($line->date_start, $line->date_end, $format);
-		}
+        // Show date range
+        if ($line->element == 'facturedetrec') {
+            if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
+            if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+            if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
+            if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+            if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
+        }
+        else {
+            if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+            //echo get_date_range($line->date_start, $line->date_end, $format);
+        }
 
-		// Add description in form
-		if ($line->fk_product > 0 && ! empty($conf->global->PRODUIT_DESC_IN_FORM))
-		{
-			print (! empty($line->description) && $line->description!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->description):'';
-		}
-	}
+        // Add description in form
+        if ($line->fk_product > 0 && ! empty($conf->global->PRODUIT_DESC_IN_FORM))
+        {
+            print (! empty($line->description) && $line->description!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->description):'';
+        }
+    }
 
-	if (! empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
-	{
-		$accountingaccount=new AccountingAccount($this->db);
-		$accountingaccount->fetch($line->fk_accounting_account);
-		echo '<div class="clearboth"></div><br><span class="opacitymedium">' . $langs->trans('AccountingAffectation') . ' : </span>' . $accountingaccount->getNomUrl(0,1,1);
-	}
+    if (! empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
+    {
+        $accountingaccount=new AccountingAccount($this->db);
+        $accountingaccount->fetch($line->fk_accounting_account);
+        echo '<div class="clearboth"></div><br><span class="opacitymedium">' . $langs->trans('AccountingAffectation') . ' : </span>' . $accountingaccount->getNomUrl(0,1,1);
+    }
 
-	?>
+    ?>
 	</td>
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-	{
-	?>
+    if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+    {
+    ?>
 		<td class="linecolrefsupplier"><?php
-		echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
-		?></td>
+        echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
+        ?></td>
 	<?php
-	}
-	// VAT Rate
-	?>
+    }
+    // VAT Rate
+    ?>
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php
-	$positiverates='';
-	if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
-	if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
-	if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
-	if (empty($positiverates)) $positiverates='0';
-	echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
-	//echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
-	?></td>
+    $positiverates='';
+    if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
+    if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
+    if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
+    if (empty($positiverates)) $positiverates='0';
+    echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
+    //echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
+    ?></td>
 
 	<td align="right" class="linecoluht nowrap"><?php $coldisplay++; ?><?php echo price($line->subprice); ?></td>
 
@@ -205,45 +205,45 @@ 
 
 	<td align="right" class="linecolqty nowrap"><?php $coldisplay++; ?>
 	<?php if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
-			// I comment this because it shows info even when not required
-			// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
-			// must also not be output for most entities (proposal, intervention, ...)
-			//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
-			echo $line->qty;
-		} else echo '&nbsp;';	?>
+            // I comment this because it shows info even when not required
+            // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
+            // must also not be output for most entities (proposal, intervention, ...)
+            //if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
+            echo $line->qty;
+        } else echo '&nbsp;';	?>
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
-	{
-		print '<td align="left" class="linecoluseunit nowrap">';
-		$label = $line->getLabelOfUnit('short');
-		if ($label !== '') {
-			print $langs->trans($label);
-		}
-		print '</td>';
-	}
-	?>
+    if($conf->global->PRODUCT_USE_UNITS)
+    {
+        print '<td align="left" class="linecoluseunit nowrap">';
+        $label = $line->getLabelOfUnit('short');
+        if ($label !== '') {
+            print $langs->trans($label);
+        }
+        print '</td>';
+    }
+    ?>
 
 	<?php if (!empty($line->remise_percent) && $line->special_code != 3) { ?>
 	<td class="linecoldiscount" align="right"><?php
-		$coldisplay++;
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		echo dol_print_reduction($line->remise_percent,$langs);
-	?></td>
+        $coldisplay++;
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        echo dol_print_reduction($line->remise_percent,$langs);
+    ?></td>
 	<?php } else { ?>
 	<td class="linecoldiscount"><?php $coldisplay++; ?>&nbsp;</td>
 	<?php }
 
-	if ($this->situation_cycle_ref) {
-		$coldisplay++;
-		print '<td align="right" class="linecolcycleref nowrap">' . $line->situation_percent . '%</td>';
-	}
+    if ($this->situation_cycle_ref) {
+        $coldisplay++;
+        print '<td align="right" class="linecolcycleref nowrap">' . $line->situation_percent . '%</td>';
+    }
 
-  	if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
-  	{
-		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-  		?>
+        if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+        {
+        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+            ?>
 
   	<?php if (!empty($user->rights->margins->creer)) { ?>
   	<td align="right" class="linecolmargin1 nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->pa_ht); ?></td>
@@ -254,8 +254,8 @@ 
     if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
   	  <td align="right" class="linecolmargin2 nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->marque_tx, null, null, null, null, $rounding).'%'; ?></td>
     <?php }
-  	}
-  	?>
+        }
+        ?>
 
 	<?php if ($line->special_code == 3)	{ ?>
 	<td align="right" class="linecoloption nowrap"><?php $coldisplay++; ?><?php echo $langs->trans('Option'); ?></td>
@@ -271,7 +271,7 @@ 
 
 
 	<?php
-	if ($this->statut == 0  && ($object_rights->creer) && $action != 'selectlines' ) { ?>
+    if ($this->statut == 0  && ($object_rights->creer) && $action != 'selectlines' ) { ?>
 	<td class="linecoledit" align="center"><?php $coldisplay++; ?>
 		<?php if (($line->info_bits & 2) == 2 || ! empty($disableedit)) { ?>
 		<?php } else { ?>
@@ -283,16 +283,16 @@ 
 
 	<td class="linecoldelete" align="center"><?php $coldisplay++; ?>
 		<?php
-		if (($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disableremove)) {
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
-			print img_delete();
-			print '</a>';
-		}
-		?>
+        if (($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disableremove)) {
+            print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
+            print img_delete();
+            print '</a>';
+        }
+        ?>
 	</td>
 
 	<?php
-	if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) { ?>
+    if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) { ?>
 	<td align="center" class="linecolmove tdlineupdown"><?php $coldisplay++; ?>
 		<?php if ($i > 0) { ?>
 		<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
@@ -321,7 +321,7 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+    print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 

dolibarr/htdocs/core/tpl/originproductline.tpl.php

Indentation +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>
@@ -33,11 +33,11 @@ 
 print '<td align="right">'.$this->tpl['vat_rate'].'</td>';
 print '<td align="right">'.$this->tpl['price'].'</td>';
 if (!empty($conf->multicurrency->enabled))
-	print '<td align="right">'.$this->tpl['multicurrency_price'].'</td>';
+    print '<td align="right">'.$this->tpl['multicurrency_price'].'</td>';
 
 print '<td align="right">'.$this->tpl['qty'].'</td>';
 if($conf->global->PRODUCT_USE_UNITS)
-	print '<td align="left">'.$langs->trans($this->tpl['unit']).'</td>';
+    print '<td align="left">'.$langs->trans($this->tpl['unit']).'</td>';
 
 print '<td align="right">'.$this->tpl['remise_percent'].'</td>';
 print '</tr>'."\n";

dolibarr/htdocs/core/tpl/extrafields_list_search_input.tpl.php

Indentation +35 added lines, -35 removed lines

@@ -3,8 +3,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
@@ -12,37 +12,37 @@ 
 // Loop to show all columns of extrafields for the search title line
 if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-	{
-		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-		{
-			if (! empty($arrayfields["ef.".$key]['checked'])) {
-				$align=$extrafields->getAlignFlag($key);
-				$typeofextrafield=$extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
-				print '<td class="liste_titre'.($align?' '.$align:'').'">';
-				if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
-				{
-					$crit=$val;
-					$tmpkey=preg_replace('/search_options_/','',$key);
-					$searchclass='';
-					if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-					print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-				}
-				elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
-				{
-					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
-					$morecss='';
-					if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
-					echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_', $morecss);
-				}
-				elseif (in_array($typeofextrafield, array('datetime','timestamp')))
-				{
-					// TODO
-					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
-				}
-				print '</td>';
-			}
-		}
-	}
+    if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    {
+        foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked'])) {
+                $align=$extrafields->getAlignFlag($key);
+                $typeofextrafield=$extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
+                print '<td class="liste_titre'.($align?' '.$align:'').'">';
+                if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
+                {
+                    $crit=$val;
+                    $tmpkey=preg_replace('/search_options_/','',$key);
+                    $searchclass='';
+                    if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+                    if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+                    print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+                }
+                elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
+                {
+                    // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+                    $morecss='';
+                    if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
+                    echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_', $morecss);
+                }
+                elseif (in_array($typeofextrafield, array('datetime','timestamp')))
+                {
+                    // TODO
+                    // Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
+                }
+                print '</td>';
+            }
+        }
+    }
 }
\ No newline at end of file

dolibarr/htdocs/core/tpl/admin_extrafields_view.tpl.php

Indentation +35 added lines, -35 removed lines

@@ -27,8 +27,8 @@ 
 // Protection to avoid direct call of template
 if (empty($langs) || ! is_object($langs))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -66,50 +66,50 @@ 
 print '<td align="center">'.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).'</td>';
 print '<td align="center">'.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).'</td>';
 if ($conf->multicompany->enabled)  {
-	print '<td align="center">'.$langs->trans("Entities").'</td>';
+    print '<td align="center">'.$langs->trans("Entities").'</td>';
 }
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
 if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type']))
 {
-	foreach($extrafields->attributes[$elementtype]['type'] as $key => $value)
-	{
-		// Load language if required
-		if (! empty($extrafields->attributes[$elementtype]['langfile'][$key])) {
-			$langs->load($extrafields->attributes[$elementtype]['langfile'][$key]);
-		}
+    foreach($extrafields->attributes[$elementtype]['type'] as $key => $value)
+    {
+        // Load language if required
+        if (! empty($extrafields->attributes[$elementtype]['langfile'][$key])) {
+            $langs->load($extrafields->attributes[$elementtype]['langfile'][$key]);
+        }
 
-		print '<tr class="oddeven">';
-		print "<td>".$extrafields->attributes[$elementtype]['pos'][$key]."</td>\n";
-		print "<td>".$extrafields->attributes[$elementtype]['label'][$key]."</td>\n";	// We don't translate here, we want admin to know what is the key not translated value
-		print "<td>".$langs->trans($extrafields->attributes[$elementtype]['label'][$key])."</td>\n";
-		print "<td>".$key."</td>\n";
-		print "<td>".$type2label[$extrafields->attributes[$elementtype]['type'][$key]]."</td>\n";
-		print '<td align="right">'.$extrafields->attributes[$elementtype]['size'][$key]."</td>\n";
-		print '<td>'.dol_trunc($extrafields->attributes[$elementtype]['computed'][$key], 20)."</td>\n";
-		print '<td align="center">'.yn($extrafields->attributes[$elementtype]['unique'][$key])."</td>\n";
-		print '<td align="center">'.yn($extrafields->attributes[$elementtype]['required'][$key])."</td>\n";
-		print '<td align="center">'.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])."</td>\n";
-		print '<td align="center">'.$extrafields->attributes[$elementtype]['list'][$key]."</td>\n";
-		print '<td align="center">'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."</td>\n";
-		if (! empty($conf->multicompany->enabled))  {
-			print '<td align="center">'.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).'</td>';
-		}
-		print '<td class="right nowraponall""><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
-		print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-		print "</tr>";
-	}
+        print '<tr class="oddeven">';
+        print "<td>".$extrafields->attributes[$elementtype]['pos'][$key]."</td>\n";
+        print "<td>".$extrafields->attributes[$elementtype]['label'][$key]."</td>\n";	// We don't translate here, we want admin to know what is the key not translated value
+        print "<td>".$langs->trans($extrafields->attributes[$elementtype]['label'][$key])."</td>\n";
+        print "<td>".$key."</td>\n";
+        print "<td>".$type2label[$extrafields->attributes[$elementtype]['type'][$key]]."</td>\n";
+        print '<td align="right">'.$extrafields->attributes[$elementtype]['size'][$key]."</td>\n";
+        print '<td>'.dol_trunc($extrafields->attributes[$elementtype]['computed'][$key], 20)."</td>\n";
+        print '<td align="center">'.yn($extrafields->attributes[$elementtype]['unique'][$key])."</td>\n";
+        print '<td align="center">'.yn($extrafields->attributes[$elementtype]['required'][$key])."</td>\n";
+        print '<td align="center">'.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])."</td>\n";
+        print '<td align="center">'.$extrafields->attributes[$elementtype]['list'][$key]."</td>\n";
+        print '<td align="center">'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."</td>\n";
+        if (! empty($conf->multicompany->enabled))  {
+            print '<td align="center">'.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).'</td>';
+        }
+        print '<td class="right nowraponall""><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
+        print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+        print "</tr>";
+    }
 }
 else
 {
-	$colspan=9;
+    $colspan=9;
 
-	print '<tr class="oddeven">';
-	print '<td class="opacitymedium" colspan="'.$colspan.'">';
-	print $langs->trans("None");
-	print '</td>';
-	print '</tr>';
+    print '<tr class="oddeven">';
+    print '<td class="opacitymedium" colspan="'.$colspan.'">';
+    print $langs->trans("None");
+    print '</td>';
+    print '</tr>';
 }
 
 print "</table>";

dolibarr/htdocs/core/commonfieldsinexport.inc.php

Indentation +32 added lines, -32 removed lines

@@ -10,31 +10,31 @@ 
 dol_include_once($keyforclassfile);
 if (class_exists($keyforclass))
 {
-	$tmpobject=new $keyforclass($this->db);
+    $tmpobject=new $keyforclass($this->db);
 
-	// Add common fields
-	foreach($tmpobject->fields as $keyfield => $valuefield)
-	{
-		$fieldname = 't' . '.' . $keyfield;
-		$fieldlabel = ucfirst($valuefield['label']);
-		$typeFilter = "Text";
-		$typefield=preg_replace('/\(.*$/', '', $valuefield['type']);	// double(24,8) -> double
-		switch ($typefield) {
-			case 'int':
-			case 'integer':
-			case 'double':
-			case 'price':
-				$typeFilter = "Numeric";
-				break;
-			case 'date':
-			case 'datetime':
-			case 'timestamp':
-				$typeFilter = "Date";
-				break;
-			case 'boolean':
-				$typeFilter = "Boolean";
-				break;
-			/*
+    // Add common fields
+    foreach($tmpobject->fields as $keyfield => $valuefield)
+    {
+        $fieldname = 't' . '.' . $keyfield;
+        $fieldlabel = ucfirst($valuefield['label']);
+        $typeFilter = "Text";
+        $typefield=preg_replace('/\(.*$/', '', $valuefield['type']);	// double(24,8) -> double
+        switch ($typefield) {
+            case 'int':
+            case 'integer':
+            case 'double':
+            case 'price':
+                $typeFilter = "Numeric";
+                break;
+            case 'date':
+            case 'datetime':
+            case 'timestamp':
+                $typeFilter = "Date";
+                break;
+            case 'boolean':
+                $typeFilter = "Boolean";
+                break;
+            /*
 			 * case 'sellist':
 			 * $tmp='';
 			 * $tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
@@ -45,16 +45,16 @@ 
 			 * if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 			 * break;
 			 */
-		}
-		if ($valuefield['enabled']) {
-			$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-			$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-			$this->export_entities_array[$r][$fieldname] = $keyforelement;
-		}
-	}
+        }
+        if ($valuefield['enabled']) {
+            $this->export_fields_array[$r][$fieldname] = $fieldlabel;
+            $this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+            $this->export_entities_array[$r][$fieldname] = $keyforelement;
+        }
+    }
 }
 else
 {
-	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
+    dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
 }
 // End add common fields