alxarafe / alixar

dolibarr/htdocs/core/tpl/massactions_pre.tpl.php

Indentation +123 added lines, -123 removed lines

@@ -29,138 +29,138 @@
 
 if ($massaction == 'predeletedraft')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
 if ($massaction == 'predelete')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
 if ($massaction == 'presend')
 {
-	$langs->load("mails");
+    $langs->load("mails");
 
-	$listofselectedid = array();
-	$listofselectedthirdparties = array();
-	$listofselectedref = array();
+    $listofselectedid = array();
+    $listofselectedthirdparties = array();
+    $listofselectedref = array();
 	
-	if (! GETPOST('cancel', 'alpha'))
-	{
-		foreach ($arrayofselected as $toselectid)
-		{
-			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
-				$listofselectedid[$toselectid] = $toselectid;
-				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe')
-					$thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport')
-					$thirdpartyid = $objecttmp->fk_user_author;
-				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
-				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
-			}
-		}
-	}
-
-	print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-
-	dol_fiche_head(null, '', '');
-
-	// Cree l'objet formulaire mail
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->withform = -1;
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
-
-	if ($formmail->fromtype === 'user')
-	{
-		$formmail->fromid = $user->id;
-	}
-	$formmail->trackid = $trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
-	{
-		include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
-	$formmail->withfrom = 1;
-	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
-	{
-		$liste = array();
-		$thirdpartyid = array_shift($listofselectedthirdparties);
-		if ($objecttmp->element == 'expensereport')
-		{
-			$fuser = new User($db);
-			$fuser->fetch($thirdpartyid);
-			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
-		}
-		else
-		{
-			$soc = new Societe($db);
-			$soc->fetch($thirdpartyid);
-			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
-				$liste[$key] = $value;
-			}
-		}
-		$formmail->withtoreadonly = 0;
-	} else {
-		$formmail->withtoreadonly = 1;
-	}
+    if (! GETPOST('cancel', 'alpha'))
+    {
+        foreach ($arrayofselected as $toselectid)
+        {
+            $result = $objecttmp->fetch($toselectid);
+            if ($result > 0)
+            {
+                $listofselectedid[$toselectid] = $toselectid;
+                $thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
+                if ($objecttmp->element == 'societe')
+                    $thirdpartyid = $objecttmp->id;
+                if ($objecttmp->element == 'expensereport')
+                    $thirdpartyid = $objecttmp->fk_user_author;
+                $listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
+                $listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
+            }
+        }
+    }
+
+    print '<input type="hidden" name="massaction" value="confirm_presend">';
+
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+
+    dol_fiche_head(null, '', '');
+
+    // Cree l'objet formulaire mail
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+    $formmail->withform = -1;
+    $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+
+    if ($formmail->fromtype === 'user')
+    {
+        $formmail->fromid = $user->id;
+    }
+    $formmail->trackid = $trackid;
+    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
+    {
+        include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+        $formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
+    }
+    $formmail->withfrom = 1;
+    $liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
+    if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
+    {
+        $liste = array();
+        $thirdpartyid = array_shift($listofselectedthirdparties);
+        if ($objecttmp->element == 'expensereport')
+        {
+            $fuser = new User($db);
+            $fuser->fetch($thirdpartyid);
+            $liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+        }
+        else
+        {
+            $soc = new Societe($db);
+            $soc->fetch($thirdpartyid);
+            foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
+                $liste[$key] = $value;
+            }
+        }
+        $formmail->withtoreadonly = 0;
+    } else {
+        $formmail->withtoreadonly = 1;
+    }
 	
-	$formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
-	$formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
-	$formmail->withtofree = empty($liste)?1:0;
-	$formmail->withtocc = 1;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	$formmail->withfile = 1;
-	// $formmail->withfile = 2; Not yet supported in mass action
-	$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
-	if ($objecttmp->element != 'societe') {
-		$formmail->withfile = '<span class="hideonsmartphone">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
-		$formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
-	}
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
-	// Make substitution in email content
-	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
-	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-	$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
-	$substitutionarray['__CONTACTCIVNAME__'] = '';
-
-	$parameters = array(
-		'mode' => 'formemail'
-	);
-	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
-
-	// Tableau des substitutions
-	$formmail->substit = $substitutionarray;
-
-	// Tableau des parametres complementaires du post
-	$formmail->param['action'] = $action;
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
-	$formmail->param['id'] = join(',', $arrayofselected);
-	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
-	{
-		$langs->load("errors");
-		print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
-		$arrayofmassactions = array();
-	}
-	else
-	{
-		print $formmail->get_form();
-	}
-
-	dol_fiche_end();
+    $formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
+    $formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
+    $formmail->withtofree = empty($liste)?1:0;
+    $formmail->withtocc = 1;
+    $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+    $formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+    $formmail->withfile = 1;
+    // $formmail->withfile = 2; Not yet supported in mass action
+    $formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
+    if ($objecttmp->element != 'societe') {
+        $formmail->withfile = '<span class="hideonsmartphone">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
+        $formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
+    }
+    $formmail->withbody = 1;
+    $formmail->withdeliveryreceipt = 1;
+    $formmail->withcancel = 1;
+
+    // Make substitution in email content
+    $substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
+    $substitutionarray['__EMAIL__'] = $sendto;
+    $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+    $substitutionarray['__PERSONALIZED__'] = '';	// deprecated
+    $substitutionarray['__CONTACTCIVNAME__'] = '';
+
+    $parameters = array(
+        'mode' => 'formemail'
+    );
+    complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
+
+    // Tableau des substitutions
+    $formmail->substit = $substitutionarray;
+
+    // Tableau des parametres complementaires du post
+    $formmail->param['action'] = $action;
+    $formmail->param['models'] = $modelmail;
+    $formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+    $formmail->param['id'] = join(',', $arrayofselected);
+    // $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+    if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
+    {
+        $langs->load("errors");
+        print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+        print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
+        $arrayofmassactions = array();
+    }
+    else
+    {
+        print $formmail->get_form();
+    }
+
+    dol_fiche_end();
 }

Spacing +14 added lines, -14 removed lines

@@ -45,7 +45,7 @@ 
 	$listofselectedthirdparties = array();
 	$listofselectedref = array();
 	
-	if (! GETPOST('cancel', 'alpha'))
+	if (!GETPOST('cancel', 'alpha'))
 	{
 		foreach ($arrayofselected as $toselectid)
 		{
@@ -66,25 +66,25 @@ 
 
 	print '<input type="hidden" name="massaction" value="confirm_presend">';
 
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 
 	dol_fiche_head(null, '', '');
 
 	// Cree l'objet formulaire mail
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->withform = -1;
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
 	if ($formmail->fromtype === 'user')
 	{
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid = $trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
+	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
 	{
-		include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
@@ -112,9 +112,9 @@ 
 		$formmail->withtoreadonly = 1;
 	}
 	
-	$formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
-	$formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
-	$formmail->withtofree = empty($liste)?1:0;
+	$formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
+	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
+	$formmail->withtofree = empty($liste) ? 1 : 0;
 	$formmail->withtocc = 1;
 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
 	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
@@ -132,8 +132,8 @@ 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-	$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
+	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 
 	$parameters = array(
@@ -150,11 +150,11 @@ 
 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
 	$formmail->param['id'] = join(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
 	{
 		$langs->load("errors");
-		print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
+		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
 	}
 	else

Braces +14 added lines, -10 removed lines

@@ -54,10 +54,12 @@ 
 			{
 				$listofselectedid[$toselectid] = $toselectid;
 				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe')
-					$thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport')
-					$thirdpartyid = $objecttmp->fk_user_author;
+				if ($objecttmp->element == 'societe') {
+									$thirdpartyid = $objecttmp->id;
+				}
+				if ($objecttmp->element == 'expensereport') {
+									$thirdpartyid = $objecttmp->fk_user_author;
+				}
 				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
 				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 			}
@@ -82,24 +84,27 @@ 
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid = $trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
+	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {
+	    // If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+	}
 		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
 	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
+	if (count($listofselectedthirdparties) == 1) {
+	    // Only 1 different recipient selected, we can suggest contacts
 	{
 		$liste = array();
+	}
 		$thirdpartyid = array_shift($listofselectedthirdparties);
 		if ($objecttmp->element == 'expensereport')
 		{
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-		}
-		else
+		} else
 		{
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
@@ -156,8 +161,7 @@ 
 		print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
 		$arrayofmassactions = array();
-	}
-	else
+	} else
 	{
 		print $formmail->get_form();
 	}

dolibarr/htdocs/core/tpl/passwordforgotten.tpl.php

Indentation +37 added lines, -37 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;
 }
 
 
@@ -111,28 +111,28 @@ 
 
 <?php
 if (! empty($morelogincontent)) {
-	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option)
-		{
-			if ($format == 'table') {
-				echo '<!-- Option by hook -->';
-				echo $option;
-			}
-		}
-	}
-	else {
-		echo '<!-- Option by hook -->';
-		echo $morelogincontent;
-	}
+    if (is_array($morelogincontent)) {
+        foreach ($morelogincontent as $format => $option)
+        {
+            if ($format == 'table') {
+                echo '<!-- Option by hook -->';
+                echo $option;
+            }
+        }
+    }
+    else {
+        echo '<!-- Option by hook -->';
+        echo $morelogincontent;
+    }
 }
 ?>
 
 <?php if ($captcha) {
-		// Add a variable param to force not using cache (jmobile)
-		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
-		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
-		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
-	?>
+        // Add a variable param to force not using cache (jmobile)
+        $php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
+        if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
+        else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+    ?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
 	<div class="tdinputlogin nowraponall none center valignmiddle tdinputlogin">
@@ -167,14 +167,14 @@ 
 <br>
 <div align="center" style="margin-top: 15px;">
 	<?php
-	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
-
-	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
-	?>
+    $moreparam='';
+    if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+    if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+    if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+    if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+
+    print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
+    ?>
 </div>
 
 </div>
@@ -206,17 +206,17 @@ 
 <?php } ?>
 
 <?php if (! empty($morelogincontent) && is_array($morelogincontent)) {
-	foreach ($morelogincontent as $format => $option)
-	{
-		if ($format == 'js') {
-			echo "\n".'<!-- Javascript by hook -->';
-			echo $option."\n";
-		}
-	}
+    foreach ($morelogincontent as $format => $option)
+    {
+        if ($format == 'js') {
+            echo "\n".'<!-- Javascript by hook -->';
+            echo $option."\n";
+        }
+    }
 }
 else if (! empty($moreloginextracontent)) {
-	echo '<!-- Javascript by hook -->';
-	echo $moreloginextracontent;
+    echo '<!-- Javascript by hook -->';
+    echo $moreloginextracontent;
 }
 ?>
 

Spacing +30 added lines, -30 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -29,32 +29,32 @@ 
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu = 1;
+if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu = 1;
+if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen = 1;
+if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile = 1;
 
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 
 $php_self = $_SERVER['PHP_SELF'];
-$php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
+$php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
 
-$titleofpage=$langs->trans('SendNewPassword');
+$titleofpage = $langs->trans('SendNewPassword');
 
 print top_htmlhead('', $titleofpage);
 
 
-$colorbackhmenu1='60,70,100';      // topmenu
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
-$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
+$colorbackhmenu1 = '60,70,100'; // topmenu
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
 
-<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
+<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script type="text/javascript">
@@ -66,7 +66,7 @@ 
 <?php } ?>
 
 
-<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"':'' ?>>
+<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"' : '' ?>>
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">
@@ -110,7 +110,7 @@ 
 </div>
 
 <?php
-if (! empty($morelogincontent)) {
+if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
 		foreach ($morelogincontent as $format => $option)
 		{
@@ -129,9 +129,9 @@ 
 
 <?php if ($captcha) {
 		// Add a variable param to force not using cache (jmobile)
-		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
-		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
-		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
+		if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
+		else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
 	?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
@@ -167,11 +167,11 @@ 
 <br>
 <div align="center" style="margin-top: 15px;">
 	<?php
-	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	$moreparam = '';
+	if (!empty($conf->dol_hide_topmenu))   $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+	if (!empty($conf->dol_hide_leftmenu))  $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+	if (!empty($conf->dol_no_mouse_hover)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+	if (!empty($conf->dol_use_jmobile))    $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$conf->dol_use_jmobile;
 
 	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
 	?>
@@ -184,12 +184,12 @@ 
 </form>
 
 
-<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' backgroundsemitransparent'; ?>" style="max-width: 70%">
-<?php if ($mode == 'dolibarr' || ! $disabled) { ?>
+<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent'; ?>" style="max-width: 70%">
+<?php if ($mode == 'dolibarr' || !$disabled) { ?>
 	<span class="passwordmessagedesc">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
 	</span>
-<?php }else{ ?>
+<?php } else { ?>
 	<div class="warning" align="center">
 	<?php echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode); ?>
 	</div>
@@ -201,11 +201,11 @@ 
 
 <?php if ($message) { ?>
 	<div class="center login_main_message">
-	<?php echo dol_htmloutput_mesg($message,'','',1); ?>
+	<?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
 	</div>
 <?php } ?>
 
-<?php if (! empty($morelogincontent) && is_array($morelogincontent)) {
+<?php if (!empty($morelogincontent) && is_array($morelogincontent)) {
 	foreach ($morelogincontent as $format => $option)
 	{
 		if ($format == 'js') {
@@ -214,7 +214,7 @@ 
 		}
 	}
 }
-else if (! empty($moreloginextracontent)) {
+else if (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }

Braces +47 added lines, -20 removed lines

@@ -29,14 +29,26 @@ 
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_topmenu')) {
+    $conf->dol_hide_topmenu=1;
+}
+if (GETPOST('dol_hide_leftmenu')) {
+    $conf->dol_hide_leftmenu=1;
+}
+if (GETPOST('dol_optimize_smallscreen')) {
+    $conf->dol_optimize_smallscreen=1;
+}
+if (GETPOST('dol_no_mouse_hover')) {
+    $conf->dol_no_mouse_hover=1;
+}
+if (GETPOST('dol_use_jmobile')) {
+    $conf->dol_use_jmobile=1;
+}
 
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (! empty($conf->dol_use_jmobile)) {
+    $conf->use_javascript_ajax=1;
+}
 
 $php_self = $_SERVER['PHP_SELF'];
 $php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
@@ -47,7 +59,9 @@ 
 
 
 $colorbackhmenu1='60,70,100';      // topmenu
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+    $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
+}
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
 
@@ -77,9 +91,13 @@ 
 <!-- Title with version -->
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+if ($disablenofollow) {
+    echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+}
 echo dol_escape_htmltag($title);
-if ($disablenofollow) echo '</a>';
+if ($disablenofollow) {
+    echo '</a>';
+}
 ?>
 </div>
 
@@ -119,8 +137,7 @@ 
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -130,8 +147,11 @@ 
 <?php if ($captcha) {
 		// Add a variable param to force not using cache (jmobile)
 		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
-		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
-		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		if (preg_match('/\?/',$php_self)) {
+		    $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
+		} else {
+		    $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		}
 	?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
@@ -168,10 +188,18 @@ 
 <div align="center" style="margin-top: 15px;">
 	<?php
 	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	if (! empty($conf->dol_hide_topmenu)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+	}
+	if (! empty($conf->dol_hide_leftmenu)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+	}
+	if (! empty($conf->dol_no_mouse_hover)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+	}
+	if (! empty($conf->dol_use_jmobile)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	}
 
 	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
 	?>
@@ -189,7 +217,7 @@ 
 	<span class="passwordmessagedesc">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
 	</span>
-<?php }else{ ?>
+<?php } else{ ?>
 	<div class="warning" align="center">
 	<?php echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode); ?>
 	</div>
@@ -213,8 +241,7 @@ 
 			echo $option."\n";
 		}
 	}
-}
-else if (! empty($moreloginextracontent)) {
+} else if (! empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }

dolibarr/htdocs/core/tpl/objectline_edit.tpl.php

Indentation +145 added lines, -145 removed lines

@@ -34,8 +34,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;
 }
 
 
@@ -78,129 +78,129 @@ 
 
 		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
-		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
-		else print img_object($langs->trans('ShowProduct'),'product');
-		echo ' '.$line->ref;
-		?>
+        if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
+        else print img_object($langs->trans('ShowProduct'),'product');
+        echo ' '.$line->ref;
+        ?>
 		</a>
 		<?php
-		echo ' - '.nl2br($line->product_label);
-		?>
+        echo ' - '.nl2br($line->product_label);
+        ?>
 
 		<br><br>
 
 	<?php }	?>
 
 	<?php
-	if (is_object($hookmanager))
-	{
-		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-	    $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
-	    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
-	}
-
-	// Do not allow editing during a situation cycle
-	if (empty($this->situation_cycle_ref) || $this->situation_counter == 1)
-	{
-		// editeur wysiwyg
-		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-		$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
-		$doleditor->Create();
-	} else {
-		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
-	}
-
-	// Show autofill date for recuring invoices
-	if (! empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
-	{
-		echo '<br>';
-		echo $langs->trans('AutoFillDateFrom').' ';
-		echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
-		echo ' - ';
-		echo $langs->trans('AutoFillDateTo').' ';
-		echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
-	}
-
-	?>
+    if (is_object($hookmanager))
+    {
+        $fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
+        $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
+        $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
+    }
+
+    // Do not allow editing during a situation cycle
+    if (empty($this->situation_cycle_ref) || $this->situation_counter == 1)
+    {
+        // editeur wysiwyg
+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+        $nbrows=ROWS_2;
+        if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+        $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+        $toolbarname='dolibarr_details';
+        if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+        $doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
+        $doleditor->Create();
+    } else {
+        print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
+    }
+
+    // Show autofill date for recuring invoices
+    if (! empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
+    {
+        echo '<br>';
+        echo $langs->trans('AutoFillDateFrom').' ';
+        echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
+        echo ' - ';
+        echo $langs->trans('AutoFillDateTo').' ';
+        echo $form->selectyesno('date_end_fill', $line->date_end_fill, 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 align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 	<?php
-	}
-
-	$coldisplay++;
-	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
-		print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
-	} else {
-		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
-	}
-
-	$coldisplay++;
-	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
-	if ($this->situation_counter > 1) print ' readonly';
-	print '></td>';
-
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
-		print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
-	}
-
-	if ($inputalsopricewithtax)
-	{
-		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
-		if ($this->situation_counter > 1) print ' readonly';
-		print '></td>';
-	}
-	?>
+    }
+
+    $coldisplay++;
+    if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
+        print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
+    } else {
+        print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
+    }
+
+    $coldisplay++;
+    print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
+    if ($this->situation_counter > 1) print ' readonly';
+    print '></td>';
+
+    if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+        print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
+    }
+
+    if ($inputalsopricewithtax)
+    {
+        $coldisplay++;
+        print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
+        if ($this->situation_counter > 1) print ' readonly';
+        print '></td>';
+    }
+    ?>
 	<td align="right"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		// 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;"')." ";
-		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
-		if ($this->situation_counter > 1) print ' readonly';
-		print '>';
-	} else { ?>
+        // 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;"')." ";
+        print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
+        if ($this->situation_counter > 1) print ' readonly';
+        print '>';
+    } else { ?>
 		&nbsp;
 	<?php } ?>
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
-	{
-		print '<td align="left">';
-		print $form->selectUnits($line->fk_unit, "units");
-		print '</td>';
-	}
-	?>
+    if($conf->global->PRODUCT_USE_UNITS)
+    {
+        print '<td align="left">';
+        print $form->selectUnits($line->fk_unit, "units");
+        print '</td>';
+    }
+    ?>
 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
-		if ($this->situation_counter > 1) print ' readonly';
-		print '>%';
-	} else { ?>
+        print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
+        if ($this->situation_counter > 1) print ' readonly';
+        print '>%';
+    } else { ?>
 		&nbsp;
 	<?php } ?>
 	</td>
 	<?php
-	if ($this->situation_cycle_ref) {
-		$coldisplay++;
-		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
-	}
-	if (! empty($usemargins))
-	{
-	?>
+    if ($this->situation_cycle_ref) {
+        $coldisplay++;
+        print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
+    }
+    if (! empty($usemargins))
+    {
+    ?>
 		<?php if (!empty($user->rights->margins->creer)) { ?>
 		<td align="right" class="margininfos"><?php $coldisplay++; ?>
 			<!-- For predef product -->
@@ -212,29 +212,29 @@ 
 		</td>
 		<?php } ?>
 	    <?php if ($user->rights->margins->creer) {
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				  {
-				    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
-				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
-					$coldisplay++;
-				  }
-				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
-				  {
-				    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
-				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
-					$coldisplay++;
-				  }
-			  }
-	}
-	?>
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                    {
+                    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
+                    // if credit note, dont allow to modify margin
+                    if ($line->subprice < 0)
+                        echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
+                    else
+                        echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+                    $coldisplay++;
+                    }
+                elseif (! empty($conf->global->DISPLAY_MARK_RATES))
+                    {
+                    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
+                    // if credit note, dont allow to modify margin
+                    if ($line->subprice < 0)
+                        echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
+                    else
+                        echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+                    $coldisplay++;
+                    }
+                }
+    }
+    ?>
 
 	<!-- colspan=4 for this td because it replace total_ht+3 td for buttons -->
 	<td align="center" colspan="<?php echo $colspan; ?>" valign="middle"><?php $coldisplay+=4; ?>
@@ -247,7 +247,7 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+    print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 
@@ -258,29 +258,29 @@ 
 	<?php } ?>
 	<td colspan="<?php echo 7+$colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
-	$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
-	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
-	print ' '.$langs->trans('to').' ';
-	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
-	print '<script type="text/javascript">';
-	if (!$line->date_start) {
-		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
-			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
-		}
-		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
-			print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
-		}
-	}
-	if (!$line->date_end) {
-		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
-			print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
-		}
-		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
-			print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
-		}
-	}
-	print '</script>'
-	?>
+    $hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
+    print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
+    print ' '.$langs->trans('to').' ';
+    print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
+    print '<script type="text/javascript">';
+    if (!$line->date_start) {
+        if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
+            print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
+        }
+        if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
+            print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
+        }
+    }
+    if (!$line->date_end) {
+        if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
+            print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
+        }
+        if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
+            print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
+        }
+    }
+    print '</script>'
+    ?>
 	</td>
 </tr>
 <?php }

Spacing +52 added lines, -52 removed lines

@@ -32,54 +32,54 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
 {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 
-$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+$usemargins = 0;
+if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
 
 global $forceall, $senderissupplier, $inputalsopricewithtax;
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (empty($dateSelector)) $dateSelector = 0;
+if (empty($forceall)) $forceall = 0;
+if (empty($senderissupplier)) $senderissupplier = 0;
+if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
 
 
 // Define colspan for button Add
-$colspan = 3;	// Col total ht + col edit + col delete
-if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
-if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
+$colspan = 3; // Col total ht + col edit + col delete
+if (!empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc
+if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier'))) $colspan++; // With this, there is a column move button
 if (empty($user->rights->margins->creer)) $colspan++;
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan += 2;
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
 
 <?php
-$coldisplay=-1; // We remove first td
+$coldisplay = -1; // We remove first td
 ?>
 <tr <?php echo $bc[$var]; ?>>
-	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
-		<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
+	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+		<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i + 1); ?></td>
 	<?php } ?>
 	<td>
 	<div id="line_<?php echo $line->id; ?>"></div>
 
 	<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
 	<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">
-	<input type="hidden" id="product_id" name="productid" value="<?php echo (! empty($line->fk_product)?$line->fk_product:0); ?>" />
+	<input type="hidden" id="product_id" name="productid" value="<?php echo (!empty($line->fk_product) ? $line->fk_product : 0); ?>" />
 	<input type="hidden" id="special_code" name="special_code" value="<?php echo $line->special_code; ?>">
 
 	<?php if ($line->fk_product > 0) { ?>
 
 		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
-		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
-		else print img_object($langs->trans('ShowProduct'),'product');
+		if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');
+		else print img_object($langs->trans('ShowProduct'), 'product');
 		echo ' '.$line->ref;
 		?>
 		</a>
@@ -95,8 +95,8 @@ 
 	if (is_object($hookmanager))
 	{
 		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-	    $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
-	    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
+	    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+	    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
 
 	// Do not allow editing during a situation cycle
@@ -104,19 +104,19 @@ 
 	{
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-		$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
+		$nbrows = ROWS_2;
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+		$toolbarname = 'dolibarr_details';
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+		$doleditor = new DolEditor('product_desc', $line->description, '', 164, $toolbarname, '', false, true, $enable, $nbrows, '98%');
 		$doleditor->Create();
 	} else {
-		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
+		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">'.$line->description.'</textarea>';
 	}
 
 	// Show autofill date for recuring invoices
-	if (! empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
+	if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
 	{
 		echo '<br>';
 		echo $langs->trans('AutoFillDateFrom').' ';
@@ -139,13 +139,13 @@ 
 
 	$coldisplay++;
 	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
-		print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
+		print '<td align="right">'.$form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : ''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1).'</td>';
 	} else {
-		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
+		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="'.price($line->tva_tx).'" readonly />%</td>';
 	}
 
 	$coldisplay++;
-	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
+	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="'.(isset($line->pu_ht) ?price($line->pu_ht, 0, '', 0) : price($line->subprice, 0, '', 0)).'"';
 	if ($this->situation_counter > 1) print ' readonly';
 	print '></td>';
 
@@ -156,7 +156,7 @@ 
 	if ($inputalsopricewithtax)
 	{
 		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
+		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc) ?price($line->pu_ttc, 0, '', 0) : '').'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '></td>';
 	}
@@ -167,7 +167,7 @@ 
 		// 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;"')." ";
-		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
+		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="'.$line->qty.'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '>';
 	} else { ?>
@@ -176,7 +176,7 @@ 
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
+	if ($conf->global->PRODUCT_USE_UNITS)
 	{
 		print '<td align="left">';
 		print $form->selectUnits($line->fk_unit, "units");
@@ -186,7 +186,7 @@ 
 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
+		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="'.$line->remise_percent.'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '>%';
 	} else { ?>
@@ -196,25 +196,25 @@ 
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
+		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="'.$line->situation_percent.'" name="progress">%</td>';
 	}
-	if (! empty($usemargins))
+	if (!empty($usemargins))
 	{
 	?>
 		<?php if (!empty($user->rights->margins->creer)) { ?>
 		<td align="right" class="margininfos"><?php $coldisplay++; ?>
 			<!-- For predef product -->
-			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
+			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat right" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input class="flat right" type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht,0,'',0); ?>">
+			<input class="flat right" type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht, 0, '', 0); ?>">
 		</td>
 		<?php } ?>
 	    <?php if ($user->rights->margins->creer) {
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 				  {
-				    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
+				    $margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
 				    // if credit note, dont allow to modify margin
 					if ($line->subprice < 0)
 						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
@@ -222,9 +222,9 @@ 
 						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 					$coldisplay++;
 				  }
-				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
+				elseif (!empty($conf->global->DISPLAY_MARK_RATES))
 				  {
-				    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
+				    $mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				    // if credit note, dont allow to modify margin
 					if ($line->subprice < 0)
 						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
@@ -237,7 +237,7 @@ 
 	?>
 
 	<!-- colspan=4 for this td because it replace total_ht+3 td for buttons -->
-	<td align="center" colspan="<?php echo $colspan; ?>" valign="middle"><?php $coldisplay+=4; ?>
+	<td align="center" colspan="<?php echo $colspan; ?>" valign="middle"><?php $coldisplay += 4; ?>
 		<input type="submit" class="button" id="savelinebutton" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>
 		<input type="submit" class="button" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 	</td>
@@ -247,21 +247,21 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 }
 ?>
 
-<?php if (! empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector)	 { ?>
+<?php if (!empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector) { ?>
 <tr id="service_duration_area" <?php echo $bc[$var]; ?>>
-	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 		<td class="linecolnum" align="center"><?php $coldisplay++; ?></td>
 	<?php } ?>
-	<td colspan="<?php echo 7+$colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
+	<td colspan="<?php echo 7 + $colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
-	$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
-	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
+	$hourmin = (isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : '');
+	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);
 	print ' '.$langs->trans('to').' ';
-	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
+	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end ? 0 : 1, "updateline", 1, 0);
 	print '<script type="text/javascript">';
 	if (!$line->date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
@@ -314,7 +314,7 @@ 
 	});
 
     <?php
-    if (! empty($conf->margin->enabled))
+    if (!empty($conf->margin->enabled))
     {
     ?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
@@ -344,7 +344,7 @@ 
 		});
 
 		/* Init field buying_price and fournprice */
-		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product?$line->fk_product:0; ?>}, function(data) {
+		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>}, function(data) {
           if (data && data.length > 0) {
 			var options = '';
 			var trouve=false;

Braces +68 added lines, -29 removed lines

@@ -40,21 +40,41 @@ 
 
 
 $usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) {
+    $usemargins=1;
+}
 
 global $forceall, $senderissupplier, $inputalsopricewithtax;
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
 
 
 // Define colspan for button Add
 $colspan = 3;	// Col total ht + col edit + col delete
-if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
-if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
-if (empty($user->rights->margins->creer)) $colspan++;
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+if (! empty($inputalsopricewithtax)) {
+    $colspan++;
+}
+// We add 1 if col total ttc
+if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) {
+    $colspan++;
+}
+// With this, there is a column move button
+if (empty($user->rights->margins->creer)) {
+    $colspan++;
+}
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+    $colspan+=2;
+}
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
@@ -78,8 +98,11 @@ 
 
 		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
-		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
-		else print img_object($langs->trans('ShowProduct'),'product');
+		if ($line->product_type==1) {
+		    echo img_object($langs->trans('ShowService'),'service');
+		} else {
+		    print img_object($langs->trans('ShowProduct'),'product');
+		}
 		echo ' '.$line->ref;
 		?>
 		</a>
@@ -105,10 +128,14 @@ 
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+		    $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		}
 		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+		    $toolbarname='dolibarr_notes';
+		}
 		$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
 		$doleditor->Create();
 	} else {
@@ -130,10 +157,13 @@ 
 	</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 align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
+		<td align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn);
+	}
+	?>"></td>
 	<?php
 	}
 
@@ -146,7 +176,9 @@ 
 
 	$coldisplay++;
 	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
-	if ($this->situation_counter > 1) print ' readonly';
+	if ($this->situation_counter > 1) {
+	    print ' readonly';
+	}
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -157,7 +189,9 @@ 
 	{
 		$coldisplay++;
 		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
-		if ($this->situation_counter > 1) print ' readonly';
+		if ($this->situation_counter > 1) {
+		    print ' readonly';
+		}
 		print '></td>';
 	}
 	?>
@@ -168,7 +202,9 @@ 
 		// 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;"')." ";
 		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
-		if ($this->situation_counter > 1) print ' readonly';
+		if ($this->situation_counter > 1) {
+		    print ' readonly';
+		}
 		print '>';
 	} else { ?>
 		&nbsp;
@@ -187,7 +223,9 @@ 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
 		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
-		if ($this->situation_counter > 1) print ' readonly';
+		if ($this->situation_counter > 1) {
+		    print ' readonly';
+		}
 		print '>%';
 	} else { ?>
 		&nbsp;
@@ -216,20 +254,21 @@ 
 				  {
 				    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
 				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+					if ($line->subprice < 0) {
+											echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
+					} else {
+											echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+					}
 					$coldisplay++;
-				  }
-				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
+				  } elseif (! empty($conf->global->DISPLAY_MARK_RATES))
 				  {
 				    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
 				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+					if ($line->subprice < 0) {
+											echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
+					} else {
+											echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+					}
 					$coldisplay++;
 				  }
 			  }

dolibarr/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,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;
 }
 
 $objectUrl = $object->getNomUrl(0,'',0,1);

Spacing +4 added lines, -4 removed lines

@@ -16,14 +16,14 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-$objectUrl = $object->getNomUrl(0,'',0,1);
-if($object->element == 'propal')
+$objectUrl = $object->getNomUrl(0, '', 0, 1);
+if ($object->element == 'propal')
 {
     $objectUrl = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
 }
@@ -53,7 +53,7 @@ 
 	        });
 
 	        
-	        var $dialog = $('<form id="' + formId + '" action="<?php print $objectUrl ; ?>"  method="post" ></form>')
+	        var $dialog = $('<form id="' + formId + '" action="<?php print $objectUrl; ?>"  method="post" ></form>')
 	        .load( page + " #tablelines", function() {
 
 	        	$("#" + formId + " #tablelines").prop("id", "ajaxloaded_tablelines"); // change id attribute

dolibarr/htdocs/core/tpl/ajaxrow.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -28,8 +28,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;
 }
 
 ?>

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -36,15 +36,15 @@ 
 
 <!-- BEGIN PHP TEMPLATE AJAXROW.TPL.PHP - Script to enable drag and drop on lines of a table -->
 <?php
-$id=$object->id;
-$fk_element=empty($object->fk_element)?$fk_element:$object->fk_element;
-$table_element_line=(empty($table_element_line)?$object->table_element_line:$table_element_line);
-$nboflines=(isset($object->lines)?count($object->lines):(isset($tasksarray)?count($tasksarray):(empty($nboflines)?0:$nboflines)));
-$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
-$tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-$filepath=(empty($filepath)?'':$filepath);
+$id = $object->id;
+$fk_element = empty($object->fk_element) ? $fk_element : $object->fk_element;
+$table_element_line = (empty($table_element_line) ? $object->table_element_line : $table_element_line);
+$nboflines = (isset($object->lines) ?count($object->lines) : (isset($tasksarray) ?count($tasksarray) : (empty($nboflines) ? 0 : $nboflines)));
+$forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
+$tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
+$filepath = (empty($filepath) ? '' : $filepath);
 
-if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1) { ?>
+if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1) { ?>
 <script type="text/javascript">
 $(document).ready(function(){
 	$(".imgupforline").hide();

dolibarr/htdocs/core/tpl/admin_extrafields_edit.tpl.php

Indentation +28 added lines, -28 removed lines

@@ -29,8 +29,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;
 }
 
 
@@ -54,17 +54,17 @@ 
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if((GETPOST('type','alpha') != "select") &&  (GETPOST('type','alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
+            if((GETPOST('type','alpha') != "select") &&  (GETPOST('type','alpha') != "sellist"))
+            {
+                print 'jQuery("#value_choice").hide();';
+            }
 
-    		if (GETPOST('type','alpha') == "separate")
-    		{
-				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+            if (GETPOST('type','alpha') == "separate")
+            {
+                print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
+                print 'jQuery("#value_choice").hide();';
+            }
+            ?>
 
     		// Case of computed field
     		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
@@ -164,19 +164,19 @@ 
 
 if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
 {
-	$param_chain = '';
-	foreach ($param['options'] as $key => $value)
-	{
-		if(strlen($key))
-		{
-			$param_chain .= $key.','.$value."\n";
-		}
-	}
+    $param_chain = '';
+    foreach ($param['options'] as $key => $value)
+    {
+        if(strlen($key))
+        {
+            $param_chain .= $key.','.$value."\n";
+        }
+    }
 }
 elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
 {
-	$paramlist=array_keys($param['options']);
-	$param_chain = $paramlist[0];
+    $paramlist=array_keys($param['options']);
+    $param_chain = $paramlist[0];
 }
 ?>
 <!-- Label -->
@@ -188,11 +188,11 @@ 
 <?php
 // Define list of possible type transition
 $typewecanchangeinto=array(
-	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password', 'text', 'html'),
-	'text'=>array('text','html'),
-	'html'=>array('text','html'),
-	'password'=>array('password', 'varchar'),
-	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+    'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password', 'text', 'html'),
+    'text'=>array('text','html'),
+    'html'=>array('text','html'),
+    'password'=>array('password', 'varchar'),
+    'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
     'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
     'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),
     'select'=>array('varchar', 'phone', 'mail', 'url', 'select')
@@ -212,7 +212,7 @@ 
 }
 else
 {
-	print $type2label[$type];
+    print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
 ?>

Spacing +42 added lines, -42 removed lines

@@ -27,7 +27,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -54,12 +54,12 @@ 
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if((GETPOST('type','alpha') != "select") &&  (GETPOST('type','alpha') != "sellist"))
+    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
     		{
     			print 'jQuery("#value_choice").hide();';
     		}
 
-    		if (GETPOST('type','alpha') == "separate")
+    		if (GETPOST('type', 'alpha') == "separate")
     		{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
     			print 'jQuery("#value_choice").hide();';
@@ -145,37 +145,37 @@ 
 <table summary="listofattributes" class="border centpercent">
 
 <?php
-$label=$extrafields->attributes[$elementtype]['label'][$attrname];
-$type=$extrafields->attributes[$elementtype]['type'][$attrname];
-$size=$extrafields->attributes[$elementtype]['size'][$attrname];
-$computed=$extrafields->attributes[$elementtype]['computed'][$attrname];
-$default=$extrafields->attributes[$elementtype]['default'][$attrname];
-$unique=$extrafields->attributes[$elementtype]['unique'][$attrname];
-$required=$extrafields->attributes[$elementtype]['required'][$attrname];
-$pos=$extrafields->attributes[$elementtype]['pos'][$attrname];
-$alwayseditable=$extrafields->attributes[$elementtype]['alwayseditable'][$attrname];
-$param=$extrafields->attributes[$elementtype]['param'][$attrname];
-$perms=$extrafields->attributes[$elementtype]['perms'][$attrname];
-$langfile=$extrafields->attributes[$elementtype]['langfile'][$attrname];
-$list=$extrafields->attributes[$elementtype]['list'][$attrname];
+$label = $extrafields->attributes[$elementtype]['label'][$attrname];
+$type = $extrafields->attributes[$elementtype]['type'][$attrname];
+$size = $extrafields->attributes[$elementtype]['size'][$attrname];
+$computed = $extrafields->attributes[$elementtype]['computed'][$attrname];
+$default = $extrafields->attributes[$elementtype]['default'][$attrname];
+$unique = $extrafields->attributes[$elementtype]['unique'][$attrname];
+$required = $extrafields->attributes[$elementtype]['required'][$attrname];
+$pos = $extrafields->attributes[$elementtype]['pos'][$attrname];
+$alwayseditable = $extrafields->attributes[$elementtype]['alwayseditable'][$attrname];
+$param = $extrafields->attributes[$elementtype]['param'][$attrname];
+$perms = $extrafields->attributes[$elementtype]['perms'][$attrname];
+$langfile = $extrafields->attributes[$elementtype]['langfile'][$attrname];
+$list = $extrafields->attributes[$elementtype]['list'][$attrname];
 $totalizable = $extrafields->attributes[$elementtype]['totalizable'][$attrname];
-$help=$extrafields->attributes[$elementtype]['help'][$attrname];
-$entitycurrentorall=$extrafields->attributes[$elementtype]['entityid'][$attrname];
+$help = $extrafields->attributes[$elementtype]['help'][$attrname];
+$entitycurrentorall = $extrafields->attributes[$elementtype]['entityid'][$attrname];
 
-if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
+if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
 {
 	$param_chain = '';
 	foreach ($param['options'] as $key => $value)
 	{
-		if(strlen($key))
+		if (strlen($key))
 		{
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
 }
-elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
+elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
 {
-	$paramlist=array_keys($param['options']);
+	$paramlist = array_keys($param['options']);
 	$param_chain = $paramlist[0];
 }
 ?>
@@ -187,10 +187,10 @@ 
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
 <?php
 // Define list of possible type transition
-$typewecanchangeinto=array(
+$typewecanchangeinto = array(
 	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password', 'text', 'html'),
-	'text'=>array('text','html'),
-	'html'=>array('text','html'),
+	'text'=>array('text', 'html'),
+	'html'=>array('text', 'html'),
 	'password'=>array('password', 'varchar'),
 	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
     'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
@@ -199,12 +199,12 @@ 
 );
 if (in_array($type, array_keys($typewecanchangeinto)))
 {
-    $newarray=array();
+    $newarray = array();
     print '<select id="type" class="flat type" name="type">';
-    foreach($type2label as $key => $val)
+    foreach ($type2label as $key => $val)
     {
-        $selected='';
-        if ($key == (GETPOST('type','alpha')?GETPOST('type','alpha'):$type)) $selected=' selected="selected"';
+        $selected = '';
+        if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
         if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
         else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
     }
@@ -229,37 +229,37 @@ 
     <tr><td>
     	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($param_chain); ?></textarea>
     </td><td>
-    <span id="helpselect"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"),1,0,'', 0, 2, 'helpvalue1')?></span>
-    <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0,'', 0, 2, 'helpvalue2')?></span>
-    <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0,'', 0, 2, 'helpvalue3')?></span>
-    <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"),1,0,'', 0, 2, 'helpvalue4')?></span>
-    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
+    <span id="helpselect"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
+    <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
+    <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
+    <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?></span>
+    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
     </td></tr>
     </table>
 </td>
 </tr>
 <!-- Position -->
-<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo dol_escape_htmltag($pos);  ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo dol_escape_htmltag($pos); ?>"></td></tr>
 <!-- Language file -->
-<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag($langfile);  ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag($langfile); ?>"></td></tr>
 <!-- Computed value -->
 <tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo dol_escape_htmltag($default); ?>"></td></tr>
 <!-- Unique -->
-<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique?' checked':''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique ? ' checked' : ''); ?>></td></tr>
 <!-- Required -->
-<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required?' checked':''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required ? ' checked' : ''); ?>></td></tr>
 <!-- Always editable -->
-<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable?' checked':''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable ? ' checked' : ''); ?>></td></tr>
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc")); ?>
-</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo ($list!=''?$list:'1'); ?>"></td></tr>
-<tr class="extra_totalizable"><td><?php echo $form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ($totalizable?' checked':''); ?>></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo ($list != '' ? $list : '1'); ?>"></td></tr>
+<tr class="extra_totalizable"><td><?php echo $form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ($totalizable ? ' checked' : ''); ?>></td></tr>
 <!-- Help tooltip -->
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag($help); ?>"></td></tr>
 <?php if ($conf->multicompany->enabled) { ?>
 	<!-- Multicompany entity -->
-    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ?' checked':''); ?>></td></tr>
+    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>
 <?php } ?>
 <!-- Visibility -->
 </table>

Braces +10 added lines, -7 removed lines

@@ -172,8 +172,7 @@ 
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
-}
-elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
+} elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
 {
 	$paramlist=array_keys($param['options']);
 	$param_chain = $paramlist[0];
@@ -204,13 +203,17 @@ 
     foreach($type2label as $key => $val)
     {
         $selected='';
-        if ($key == (GETPOST('type','alpha')?GETPOST('type','alpha'):$type)) $selected=' selected="selected"';
-        if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
-        else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+        if ($key == (GETPOST('type','alpha')?GETPOST('type','alpha'):$type)) {
+            $selected=' selected="selected"';
+        }
+        if (in_array($key, $typewecanchangeinto[$type])) {
+            print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
+        } else {
+            print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+        }
     }
     print '</select>';
-}
-else
+} else
 {
 	print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';

dolibarr/htdocs/core/tpl/document_actions_post_headers.tpl.php

Indentation +21 added lines, -21 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;
 }
 
 
@@ -51,16 +51,16 @@ 
 
 if ($action == 'delete')
 {
-	$langs->load("companies");	// Need for string DeleteFile+ConfirmDeleteFiles
-	print $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode(GETPOST("urlfile")) . '&linkid=' . GETPOST('linkid', 'int') . (empty($param)?'':$param),
-			$langs->trans('DeleteFile'),
-			$langs->trans('ConfirmDeleteFile'),
-			'confirm_deletefile',
-			'',
-			0,
-			1
-	);
+    $langs->load("companies");	// Need for string DeleteFile+ConfirmDeleteFiles
+    print $form->formconfirm(
+            $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode(GETPOST("urlfile")) . '&linkid=' . GETPOST('linkid', 'int') . (empty($param)?'':$param),
+            $langs->trans('DeleteFile'),
+            $langs->trans('ConfirmDeleteFile'),
+            'confirm_deletefile',
+            '',
+            0,
+            1
+    );
 }
 
 $formfile=new FormFile($db);
@@ -69,12 +69,12 @@ 
 $savingdocmask='';
 if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
 {
-	//var_dump($modulepart);
-	if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','expedition','project','project_task','expensereport','tax', 'produit', 'product_batch')))
-	{
-		$savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
-	}
-	/*if (in_array($modulepart,array('member')))
+    //var_dump($modulepart);
+    if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','expedition','project','project_task','expensereport','tax', 'produit', 'product_batch')))
+    {
+        $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
+    }
+    /*if (in_array($modulepart,array('member')))
 	{
 		$savingdocmask=$object->login.'___file__';
 	}*/
@@ -89,9 +89,9 @@ 
     $permission,
     $conf->browser->layout == 'phone' ? 40 : 60,
     $object,
-	'',
-	1,
-	$savingdocmask
+    '',
+    1,
+    $savingdocmask
 );
 
 // List of document

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
 // $param       = param to add to download links
 
 // Protection to avoid direct call of template
-if (empty($langs) || ! is_object($langs))
+if (empty($langs) || !is_object($langs))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -33,15 +33,15 @@ 
 
 
 $langs->load("link");
-if (empty($relativepathwithnofile)) $relativepathwithnofile='';
-if (empty($permtoedit)) $permtoedit=-1;
+if (empty($relativepathwithnofile)) $relativepathwithnofile = '';
+if (empty($permtoedit)) $permtoedit = -1;
 
 // Drag and drop for up and down allowed on product, thirdparty, ...
 // The drag and drop call the page core/ajax/row.php
 // If you enable the move up/down of files here, check that page that include template set its sortorder on 'position_name' instead of 'name'
 // Also the object->fk_element must be defined.
-$disablemove=1;
-if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) $disablemove=0;
+$disablemove = 1;
+if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) $disablemove = 0;
 
 
 
@@ -51,9 +51,9 @@ 
 
 if ($action == 'delete')
 {
-	$langs->load("companies");	// Need for string DeleteFile+ConfirmDeleteFiles
+	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
 	print $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode(GETPOST("urlfile")) . '&linkid=' . GETPOST('linkid', 'int') . (empty($param)?'':$param),
+			$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
 			$langs->trans('DeleteFile'),
 			$langs->trans('ConfirmDeleteFile'),
 			'confirm_deletefile',
@@ -63,16 +63,16 @@ 
 	);
 }
 
-$formfile=new FormFile($db);
+$formfile = new FormFile($db);
 
 // We define var to enable the feature to add prefix of uploaded files
-$savingdocmask='';
+$savingdocmask = '';
 if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
 {
 	//var_dump($modulepart);
-	if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','expedition','project','project_task','expensereport','tax', 'produit', 'product_batch')))
+	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch')))
 	{
-		$savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
+		$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 	}
 	/*if (in_array($modulepart,array('member')))
 	{
@@ -82,7 +82,7 @@ 
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject)?'':'&withproject=1'),
+    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1'),
     '',
     0,
     0,
@@ -101,7 +101,7 @@ 
     $modulepart,
     $param,
     0,
-    $relativepathwithnofile,		// relative path with no file. For example "0/1"
+    $relativepathwithnofile, // relative path with no file. For example "0/1"
     $permission,
     0,
     '',

Braces +9 added lines, -3 removed lines

@@ -33,15 +33,21 @@
 
 
 $langs->load("link");
-if (empty($relativepathwithnofile)) $relativepathwithnofile='';
-if (empty($permtoedit)) $permtoedit=-1;
+if (empty($relativepathwithnofile)) {
+    $relativepathwithnofile='';
+}
+if (empty($permtoedit)) {
+    $permtoedit=-1;
+}
 
 // Drag and drop for up and down allowed on product, thirdparty, ...
 // The drag and drop call the page core/ajax/row.php
 // If you enable the move up/down of files here, check that page that include template set its sortorder on 'position_name' instead of 'name'
 // Also the object->fk_element must be defined.
 $disablemove=1;
-if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) $disablemove=0;
+if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) {
+    $disablemove=0;
+}
 
 
 

dolibarr/htdocs/core/tpl/objectline_create.tpl.php

Indentation +343 added lines, -343 removed lines

@@ -35,8 +35,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;
 }
 
 
@@ -65,30 +65,30 @@ 
 $objectline = null;
 if (!empty($extrafieldsline))
 {
-	if ($this->table_element_line=='commandedet') {
-		$objectline = new OrderLine($this->db);
-	}
-	elseif ($this->table_element_line=='propaldet') {
-		$objectline = new PropaleLigne($this->db);
-	}
-	elseif ($this->table_element_line=='supplier_proposaldet') {
-		$objectline = new SupplierProposalLine($this->db);
-	}
-	elseif ($this->table_element_line=='facturedet') {
-		$objectline = new FactureLigne($this->db);
-	}
-	elseif ($this->table_element_line=='contratdet') {
-		$objectline = new ContratLigne($this->db);
-	}
-	elseif ($this->table_element_line=='commande_fournisseurdet') {
-		$objectline = new CommandeFournisseurLigne($this->db);
-	}
-	elseif ($this->table_element_line=='facture_fourn_det') {
-		$objectline = new SupplierInvoiceLine($this->db);
-	}
-	elseif ($this->table_element_line=='facturedet_rec') {
-		$objectline = new FactureLigneRec($this->db);
-	}
+    if ($this->table_element_line=='commandedet') {
+        $objectline = new OrderLine($this->db);
+    }
+    elseif ($this->table_element_line=='propaldet') {
+        $objectline = new PropaleLigne($this->db);
+    }
+    elseif ($this->table_element_line=='supplier_proposaldet') {
+        $objectline = new SupplierProposalLine($this->db);
+    }
+    elseif ($this->table_element_line=='facturedet') {
+        $objectline = new FactureLigne($this->db);
+    }
+    elseif ($this->table_element_line=='contratdet') {
+        $objectline = new ContratLigne($this->db);
+    }
+    elseif ($this->table_element_line=='commande_fournisseurdet') {
+        $objectline = new CommandeFournisseurLigne($this->db);
+    }
+    elseif ($this->table_element_line=='facture_fourn_det') {
+        $objectline = new SupplierInvoiceLine($this->db);
+    }
+    elseif ($this->table_element_line=='facturedet_rec') {
+        $objectline = new FactureLigneRec($this->db);
+    }
 }
 
 ?>
@@ -106,9 +106,9 @@ 
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</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"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
 	<?php } ?>
 	<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
@@ -121,39 +121,39 @@ 
 	<?php } ?>
 	<td class="linecolqty" align="right"><?php echo $langs->trans('Qty'); ?></td>
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
-	{
-		print '<td class="linecoluseunit" align="left">';
-		print '<span id="title_units">';
-		print $langs->trans('Unit');
-		print '</span></td>';
-	}
-	?>
+    if($conf->global->PRODUCT_USE_UNITS)
+    {
+        print '<td class="linecoluseunit" align="left">';
+        print '<span id="title_units">';
+        print $langs->trans('Unit');
+        print '</span></td>';
+    }
+    ?>
 	<td class="linecoldiscount" align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
 	<?php
-	if ($this->situation_cycle_ref) {
-		print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
-	}
-	if (! empty($usemargins))
-	{
-		if (!empty($user->rights->margins->creer)) {
-		?>
+    if ($this->situation_cycle_ref) {
+        print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
+    }
+    if (! empty($usemargins))
+    {
+        if (!empty($user->rights->margins->creer)) {
+        ?>
 		<td align="right" class="margininfos linecolmargin1">
 		<?php
-		}
-		else $colspan++;
+        }
+        else $colspan++;
 
-		if ($conf->global->MARGIN_TYPE == "1")
-			echo $langs->trans('BuyingPrice');
-		else
-			echo $langs->trans('CostPrice');
-		?>
+        if ($conf->global->MARGIN_TYPE == "1")
+            echo $langs->trans('BuyingPrice');
+        else
+            echo $langs->trans('CostPrice');
+        ?>
 		</td>
 		<?php
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
-	}
-	?>
+        if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
+        if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+    }
+    ?>
 	<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
 </tr>
 <?php
@@ -163,13 +163,13 @@ 
 <?php
 // Adds a line numbering column
 if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-	$coldisplay=2;
-	?>
+    $coldisplay=2;
+    ?>
 	<td class="nobottom linecolnum" align="center" width="5"></td>
 	<?php
 }
 else {
-	$coldisplay=0;
+    $coldisplay=0;
 }
 ?>
 
@@ -177,172 +177,172 @@ 
 
 	<?php
 
-	$freelines = false;
-	if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
-	{
-		$freelines = true;
-		$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
-		if ($object->element == 'contrat')
-		{
-			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=3;
-		}
+    $freelines = false;
+    if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
+    {
+        $freelines = true;
+        $forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
+        if ($object->element == 'contrat')
+        {
+            if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+            else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=3;
+        }
 
-		// Free line
-		echo '<span class="prod_entry_mode_free">';
-		// Show radio free line
-		if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
-		{
-			echo '<label for="prod_entry_mode_free">';
-			echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
-			//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
-			echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : '');
-			echo '> ';
-			// Show type selector
-			echo $langs->trans("FreeLineOfType");
-			echo '</label>';
-			echo ' ';
-		}
-		else
-		{
-			echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
-			// Show type selector
-			if ($forceall >= 0)
-			{
-			    if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
-				else echo $langs->trans("FreeLineOfType");
-				echo ' ';
-			}
-		}
+        // Free line
+        echo '<span class="prod_entry_mode_free">';
+        // Show radio free line
+        if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+        {
+            echo '<label for="prod_entry_mode_free">';
+            echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
+            //echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
+            echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : '');
+            echo '> ';
+            // Show type selector
+            echo $langs->trans("FreeLineOfType");
+            echo '</label>';
+            echo ' ';
+        }
+        else
+        {
+            echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
+            // Show type selector
+            if ($forceall >= 0)
+            {
+                if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
+                else echo $langs->trans("FreeLineOfType");
+                echo ' ';
+            }
+        }
 
-		echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
+        echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
 
-		echo '</span>';
-	}
+        echo '</span>';
+    }
 
-	// Predefined product/service
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
-	{
-		if ($forceall >= 0 && $freelines) echo '<br>';
-		echo '<span class="prod_entry_mode_predef">';
-		echo '<label for="prod_entry_mode_predef">';
-		echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked':'').'> ';
-		if (empty($senderissupplier))
-		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
-			else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
-			else echo $langs->trans('PredefinedProductsAndServicesToSell');
-		}
-		else
-		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
-			else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
-			else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
-		}
-		echo '</label>';
-		echo ' ';
+    // Predefined product/service
+    if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+    {
+        if ($forceall >= 0 && $freelines) echo '<br>';
+        echo '<span class="prod_entry_mode_predef">';
+        echo '<label for="prod_entry_mode_predef">';
+        echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked':'').'> ';
+        if (empty($senderissupplier))
+        {
+            if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
+            else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
+            else echo $langs->trans('PredefinedProductsAndServicesToSell');
+        }
+        else
+        {
+            if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
+            else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
+            else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
+        }
+        echo '</label>';
+        echo ' ';
 
-		$filtertype='';
-		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
+        $filtertype='';
+        if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
 
-		if (empty($senderissupplier))
-		{
-			if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
-			{
-				// hide products in closed warehouse, but show products for internal transfer
-				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-			}
-			else
-			{
-				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array'));
-			}
-		}
-		else
-		{
-			// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum
-		    if ($senderissupplier != 2)
-		    {
-    			$ajaxoptions=array(
-    					'update' => array('qty'=>'qty','remise_percent' => 'discount','idprod' => 'idprod'),	// html id tags that will be edited with which ajax json response key
-    					'option_disabled' => 'idthatdoesnotexists',					// html id to disable once select is done
-    					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
-    			);
-    			$alsoproductwithnosupplierprice=0;
-		    }
-		    else
-		    {
-		        $ajaxoptions = array();
-		        $alsoproductwithnosupplierprice=1;
-		    }
-
-			$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1, $alsoproductwithnosupplierprice);
-		}
-		echo '<input type="hidden" name="pbq" id="pbq" value="">';
-		echo '</span>';
-	}
+        if (empty($senderissupplier))
+        {
+            if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
+            {
+                // hide products in closed warehouse, but show products for internal transfer
+                $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
+            }
+            else
+            {
+                $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array'));
+            }
+        }
+        else
+        {
+            // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum
+            if ($senderissupplier != 2)
+            {
+                $ajaxoptions=array(
+                        'update' => array('qty'=>'qty','remise_percent' => 'discount','idprod' => 'idprod'),	// html id tags that will be edited with which ajax json response key
+                        'option_disabled' => 'idthatdoesnotexists',					// html id to disable once select is done
+                        'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
+                );
+                $alsoproductwithnosupplierprice=0;
+            }
+            else
+            {
+                $ajaxoptions = array();
+                $alsoproductwithnosupplierprice=1;
+            }
 
-	if (is_object($hookmanager) && empty($senderissupplier))
-	{
-        $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
-		$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
-		if (!empty($hookmanager->resPrint)) {
-			print $hookmanager->resPrint;
-		}
-	}
-	if (is_object($hookmanager) && ! empty($senderissupplier))
-	{
-		$parameters=array('htmlname'=>'addproduct');
-		$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
-		if (!empty($hookmanager->resPrint)) {
-			print $hookmanager->resPrint;
-		}
-	}
+            $form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1, $alsoproductwithnosupplierprice);
+        }
+        echo '<input type="hidden" name="pbq" id="pbq" value="">';
+        echo '</span>';
+    }
 
+    if (is_object($hookmanager) && empty($senderissupplier))
+    {
+        $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
+        $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+        if (!empty($hookmanager->resPrint)) {
+            print $hookmanager->resPrint;
+        }
+    }
+    if (is_object($hookmanager) && ! empty($senderissupplier))
+    {
+        $parameters=array('htmlname'=>'addproduct');
+        $reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
+        if (!empty($hookmanager->resPrint)) {
+            print $hookmanager->resPrint;
+        }
+    }
 
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
 
-		if (!empty($conf->variants->enabled)) {
-			echo '<div id="attributes_box"></div>';
-		}
+    if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
 
-		echo '<br>';
-	}
+        if (!empty($conf->variants->enabled)) {
+            echo '<div id="attributes_box"></div>';
+        }
 
-	// Editor wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$nbrows=ROWS_2;
-	$enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-	$toolbarname='dolibarr_details';
-	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-	$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%');
-	$doleditor->Create();
-
-	// Show autofill date for recuring invoices
-	if (! empty($conf->service->enabled) && $object->element == 'facturerec')
-	{
-		echo '<div class="divlinefordates"><br>';
-		echo $langs->trans('AutoFillDateFrom').' ';
-		echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
-		echo ' - ';
-		echo $langs->trans('AutoFillDateTo').' ';
-		echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
-		echo '</div>';
-	}
-	?>
+        echo '<br>';
+    }
+
+    // Editor wysiwyg
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $nbrows=ROWS_2;
+    $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+    $toolbarname='dolibarr_details';
+    if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+    $doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%');
+    $doleditor->Create();
+
+    // Show autofill date for recuring invoices
+    if (! empty($conf->service->enabled) && $object->element == 'facturerec')
+    {
+        echo '<div class="divlinefordates"><br>';
+        echo $langs->trans('AutoFillDateFrom').' ';
+        echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
+        echo ' - ';
+        echo $langs->trans('AutoFillDateTo').' ';
+        echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
+        echo '</div>';
+    }
+    ?>
 	</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="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref",'alpha',2):''); ?>"></td>
 	<?php } ?>
 
 	<td class="nobottom linecolvat" align="right"><?php
-	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
-	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
-	?>
+    if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
+    else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
+    ?>
 	</td>
 	<td class="nobottom linecoluht" align="right">
 	<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"])?GETPOST("price_ht",'alpha',2):''); ?>">
@@ -362,27 +362,27 @@ 
 	<td class="nobottom linecolqty" align="right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (isset($_POST["qty"])?GETPOST("qty",'alpha',2):1); ?>">
 	</td>
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
-	{
-		print '<td class="nobottom linecoluseunit" align="left">';
-		print $form->selectUnits($line->fk_unit, "units");
-		print '</td>';
-	}
-	$remise_percent = $buyer->remise_percent;
-	if($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
-		$remise_percent = $seller->remise_supplier_percent;
-	}
-	?>
+    if($conf->global->PRODUCT_USE_UNITS)
+    {
+        print '<td class="nobottom linecoluseunit" align="left">';
+        print $form->selectUnits($line->fk_unit, "units");
+        print '</td>';
+    }
+    $remise_percent = $buyer->remise_percent;
+    if($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+        $remise_percent = $seller->remise_supplier_percent;
+    }
+    ?>
 	<td class="nobottom nowrap linecoldiscount" align="right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (isset($_POST["remise_percent"])?GETPOST("remise_percent",'alpha',2):$remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
 	<?php
-	if ($this->situation_cycle_ref) {
-		$coldisplay++;
-		print '<td class="nobottom nowrap" align="right"><input class="falt right" type="text" size="1" value="0" name="progress">%</td>';
-	}
-	if (! empty($usemargins))
-	{
-		if (!empty($user->rights->margins->creer)) {
-		?>
+    if ($this->situation_cycle_ref) {
+        $coldisplay++;
+        print '<td class="nobottom nowrap" align="right"><input class="falt right" type="text" size="1" value="0" name="progress">%</td>';
+    }
+    if (! empty($usemargins))
+    {
+        if (!empty($user->rights->margins->creer)) {
+        ?>
 		<td align="right" class="nobottom margininfos linecolmargin">
 			<!-- For predef product -->
 			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
@@ -392,29 +392,29 @@ 
 			<input type="text" size="5" id="buying_price" name="buying_price" class="flat right" value="<?php echo (isset($_POST["buying_price"])?GETPOST("buying_price",'alpha',2):''); ?>">
 		</td>
 		<?php
-		$coldisplay++;
-		}
+        $coldisplay++;
+        }
 
-		if ($user->rights->margins->creer)
-		{
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			{
-				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?GETPOST("np_marginRate",'alpha',2):'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
-				$coldisplay++;
-			}
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-			{
-				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
-				$coldisplay++;
-			}
-		}
-		else
-		{
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $coldisplay++;
-			if (! empty($conf->global->DISPLAY_MARK_RATES))   $coldisplay++;
-		}
-	}
-	?>
+        if ($user->rights->margins->creer)
+        {
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+            {
+                echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?GETPOST("np_marginRate",'alpha',2):'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
+                $coldisplay++;
+            }
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+            {
+                echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
+                $coldisplay++;
+            }
+        }
+        else
+        {
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $coldisplay++;
+            if (! empty($conf->global->DISPLAY_MARK_RATES))   $coldisplay++;
+        }
+    }
+    ?>
 	<td class="nobottom linecoledit" align="center" valign="middle" colspan="<?php echo $colspan; ?>">
 		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline" id="addline">
 	</td>
@@ -422,98 +422,98 @@ 
 
 <?php
 if (is_object($objectline)) {
-	print $objectline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+    print $objectline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 
 <?php
 if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
 {
-	$colspan = 6;
-
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-	{
-		$colspan++;
-	}
-	if ($this->situation_cycle_ref) {
-		$colspan++;
-	}
-	// We add 1 if col total ttc
-	if (!empty($inputalsopricewithtax)) {
-		$colspan++;
-	}
-	if ($conf->global->PRODUCT_USE_UNITS) {
-		$colspan++;
-	}
-	if (count($object->lines)) {
-		//There will be an edit and a delete button
-		$colspan += 2;
-
-		// With this, there is a column move button ONLY if lines > 1
-		if (in_array($object->element, array(
-			'propal',
-			'supplier_proposal',
-			'facture',
-		    'facturerec',
-			'invoice',
-			'commande',
-			'order',
-			'order_supplier',
-			'invoice_supplier'
-		))) {
-			$colspan++;
-		}
-	}
+    $colspan = 6;
+
+    if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+    {
+        $colspan++;
+    }
+    if ($this->situation_cycle_ref) {
+        $colspan++;
+    }
+    // We add 1 if col total ttc
+    if (!empty($inputalsopricewithtax)) {
+        $colspan++;
+    }
+    if ($conf->global->PRODUCT_USE_UNITS) {
+        $colspan++;
+    }
+    if (count($object->lines)) {
+        //There will be an edit and a delete button
+        $colspan += 2;
+
+        // With this, there is a column move button ONLY if lines > 1
+        if (in_array($object->element, array(
+            'propal',
+            'supplier_proposal',
+            'facture',
+            'facturerec',
+            'invoice',
+            'commande',
+            'order',
+            'order_supplier',
+            'invoice_supplier'
+        ))) {
+            $colspan++;
+        }
+    }
 
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+    if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
 
-	if (! empty($usemargins))
-	{
-		if (!empty($user->rights->margins->creer)) $colspan++; // For the buying price
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-		if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
-	}
-	?>
+    if (! empty($usemargins))
+    {
+        if (!empty($user->rights->margins->creer)) $colspan++; // For the buying price
+        if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+        if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
+    }
+    ?>
 
 	<tr id="trlinefordates" <?php echo $bcnd[$var]; ?>>
 	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td></td>'; } ?>
 	<td colspan="<?php echo $colspan; ?>">
 	<?php
-	$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-	$date_end=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-	if (! empty($object->element) && $object->element == 'contrat')
-	{
-		print $langs->trans("DateStartPlanned").' ';
-		print $form->selectDate($date_start,"date_start",$usehm,$usehm,1,"addproduct");
-		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
-		print $form->selectDate($date_end,"date_end",$usehm,$usehm,1,"addproduct");
-	}
-	else
-	{
-		echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
-		echo ' '.$langs->trans('to').' ';
-		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
-	};
-	print '<script type="text/javascript">';
-	if (!$date_start) {
-		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
-			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
-		}
-		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
-			print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
-		}
-	}
-	if (!$date_end) {
-		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
-			print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
-		}
-		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
-			print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
-		}
-	}
-	print '</script>'
-	?>
+    $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+    $date_end=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+    if (! empty($object->element) && $object->element == 'contrat')
+    {
+        print $langs->trans("DateStartPlanned").' ';
+        print $form->selectDate($date_start,"date_start",$usehm,$usehm,1,"addproduct");
+        print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
+        print $form->selectDate($date_end,"date_end",$usehm,$usehm,1,"addproduct");
+    }
+    else
+    {
+        echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
+        print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
+        echo ' '.$langs->trans('to').' ';
+        print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
+    };
+    print '<script type="text/javascript">';
+    if (!$date_start) {
+        if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
+            print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
+        }
+        if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
+            print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
+        }
+    }
+    if (!$date_end) {
+        if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
+            print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
+        }
+        if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
+            print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
+        }
+    }
+    print '</script>'
+    ?>
 	</td>
 	</tr>
 <?php
@@ -530,19 +530,19 @@ 
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
 		<?php
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
+        if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
 			$("input[name='np_marginRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_marginRate");
 			});
 		<?php
-		}
-		if (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
+        }
+        if (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
 			$("input[name='np_markRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_markRate");
 			});
 		<?php
-		}
-		?>
+        }
+        ?>
 	});
 
 	/* TODO This does not work for number with thousand separator that is , */
@@ -633,11 +633,11 @@ 
 	});
 
 	<?php
-	if(!$freelines) { ?>
+    if(!$freelines) { ?>
 		$("#prod_entry_mode_predef").click();
 	<?php
-	}
-	?>
+    }
+    ?>
 
 	/* When changing predefined product, we reload list of supplier prices required for margin combo */
 	$("#idprod, #idprodfournprice").change(function()
@@ -649,10 +649,10 @@ 
 		jQuery('#trlinefordates').show();
 
 		<?php
-		if (! empty($usemargins) && $user->rights->margins->creer)
-		{
-			$langs->load('stocks');
-			?>
+        if (! empty($usemargins) && $user->rights->margins->creer)
+        {
+            $langs->load('stocks');
+            ?>
 
     		/* Code for margin */
       		$("#fournprice_predef").find("option").remove();
@@ -673,12 +673,12 @@ 
 
     				/* setup of margin calculation */
     	      		var defaultbuyprice = '<?php
-    	      		if (isset($conf->global->MARGIN_TYPE))
-    	      		{
-    	      		    if ($conf->global->MARGIN_TYPE == '1')   print 'bestsupplierprice';
-    	      		    if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
-    	      		    if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
-    	      		} ?>';
+                        if (isset($conf->global->MARGIN_TYPE))
+                        {
+                            if ($conf->global->MARGIN_TYPE == '1')   print 'bestsupplierprice';
+                            if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
+                            if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
+                        } ?>';
     	      		console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
 
     	      		var i = 0;

Spacing +106 added lines, -106 removed lines

@@ -33,60 +33,60 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
 {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 
-$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande')))
+$usemargins = 0;
+if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande')))
 {
-    $usemargins=1;
+    $usemargins = 1;
 }
 
-if (! isset($dateSelector)) global $dateSelector;	// Take global var only if not already defined into function calling (for example formAddObjectLine)
+if (!isset($dateSelector)) global $dateSelector; // Take global var only if not already defined into function calling (for example formAddObjectLine)
 global $forceall, $forcetoshowtitlelines, $senderissupplier, $inputalsopricewithtax;
 
-if (! isset($dateSelector)) $dateSelector=1;    // For backward compatibility
-elseif (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (!isset($dateSelector)) $dateSelector = 1; // For backward compatibility
+elseif (empty($dateSelector)) $dateSelector = 0;
+if (empty($forceall)) $forceall = 0;
+if (empty($senderissupplier)) $senderissupplier = 0;
+if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
 
 
 // Define colspan for button Add
-$colspan = 3;	// Col total ht + col edit + col delete
-if (in_array($object->element,array('propal','commande','order','facture','facturerec','invoice','supplier_proposal','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
+$colspan = 3; // Col total ht + col edit + col delete
+if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier'))) $colspan++; // With this, there is a column move button
 //print $object->element;
 
 // Lines for extrafield
 $objectline = null;
 if (!empty($extrafieldsline))
 {
-	if ($this->table_element_line=='commandedet') {
+	if ($this->table_element_line == 'commandedet') {
 		$objectline = new OrderLine($this->db);
 	}
-	elseif ($this->table_element_line=='propaldet') {
+	elseif ($this->table_element_line == 'propaldet') {
 		$objectline = new PropaleLigne($this->db);
 	}
-	elseif ($this->table_element_line=='supplier_proposaldet') {
+	elseif ($this->table_element_line == 'supplier_proposaldet') {
 		$objectline = new SupplierProposalLine($this->db);
 	}
-	elseif ($this->table_element_line=='facturedet') {
+	elseif ($this->table_element_line == 'facturedet') {
 		$objectline = new FactureLigne($this->db);
 	}
-	elseif ($this->table_element_line=='contratdet') {
+	elseif ($this->table_element_line == 'contratdet') {
 		$objectline = new ContratLigne($this->db);
 	}
-	elseif ($this->table_element_line=='commande_fournisseurdet') {
+	elseif ($this->table_element_line == 'commande_fournisseurdet') {
 		$objectline = new CommandeFournisseurLigne($this->db);
 	}
-	elseif ($this->table_element_line=='facture_fourn_det') {
+	elseif ($this->table_element_line == 'facture_fourn_det') {
 		$objectline = new SupplierInvoiceLine($this->db);
 	}
-	elseif ($this->table_element_line=='facturedet_rec') {
+	elseif ($this->table_element_line == 'facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
 	}
 }
@@ -95,11 +95,11 @@ 
 
 <!-- BEGIN PHP TEMPLATE objectline_create.tpl.php -->
 <?php
-$nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines);
+$nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 if ($nolinesbefore) {
 ?>
-<tr class="liste_titre<?php echo (($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add_') ?> nodrag nodrop">
-	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+<tr class="liste_titre<?php echo (($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_add_') ?> nodrag nodrop">
+	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 	<td class="linecolnum" align="center"></td>
 	<?php } ?>
 	<td class="linecoldescription minwidth500imp">
@@ -113,15 +113,15 @@ 
 	<?php } ?>
 	<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 	<td class="linecoluht" align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
-	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++;?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++; ?>
 	<td class="linecoluht_currency" align="right"><span id="title_up_ht_currency"><?php echo $langs->trans('PriceUHTCurrency'); ?></span></td>
 	<?php } ?>
-	<?php if (! empty($inputalsopricewithtax)) { ?>
+	<?php if (!empty($inputalsopricewithtax)) { ?>
 	<td class="linecoluttc" align="right"><span id="title_up_ttc"><?php echo $langs->trans('PriceUTTC'); ?></span></td>
 	<?php } ?>
 	<td class="linecolqty" align="right"><?php echo $langs->trans('Qty'); ?></td>
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
+	if ($conf->global->PRODUCT_USE_UNITS)
 	{
 		print '<td class="linecoluseunit" align="left">';
 		print '<span id="title_units">';
@@ -132,9 +132,9 @@ 
 	<td class="linecoldiscount" align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
 	<?php
 	if ($this->situation_cycle_ref) {
-		print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
+		print '<td class="linecolcycleref" align="right">'.$langs->trans('Progress').'</td>';
 	}
-	if (! empty($usemargins))
+	if (!empty($usemargins))
 	{
 		if (!empty($user->rights->margins->creer)) {
 		?>
@@ -150,8 +150,8 @@ 
 		?>
 		</td>
 		<?php
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+		if ($user->rights->margins->creer && !empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
+		if ($user->rights->margins->creer && !empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
 	}
 	?>
 	<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
@@ -159,17 +159,17 @@ 
 <?php
 }
 ?>
-<tr class="pair nodrag nodrop nohoverpair<?php echo ($nolinesbefore || $object->element=='contrat')?'':' liste_titre_create'; ?>">
+<tr class="pair nodrag nodrop nohoverpair<?php echo ($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_create'; ?>">
 <?php
 // Adds a line numbering column
-if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-	$coldisplay=2;
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	$coldisplay = 2;
 	?>
 	<td class="nobottom linecolnum" align="center" width="5"></td>
 	<?php
 }
 else {
-	$coldisplay=0;
+	$coldisplay = 0;
 }
 ?>
 
@@ -181,22 +181,22 @@ 
 	if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
 	{
 		$freelines = true;
-		$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
+		$forceall = 1; // We always force all type for free lines (module product or service means we use predefined product or service)
 		if ($object->element == 'contrat')
 		{
-			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=3;
+			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall = -1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall = 3;
 		}
 
 		// Free line
 		echo '<span class="prod_entry_mode_free">';
 		// Show radio free line
-		if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+		if ($forceall >= 0 && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
 		{
 			echo '<label for="prod_entry_mode_free">';
 			echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
 			//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
-			echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : '');
+			echo (GETPOST('prod_entry_mode') == 'free' ? ' checked' : '');
 			echo '> ';
 			// Show type selector
 			echo $langs->trans("FreeLineOfType");
@@ -215,39 +215,39 @@ 
 			}
 		}
 
-		echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
+		echo $form->select_type_of_lines(isset($_POST["type"]) ?GETPOST("type", 'alpha', 2) : -1, 'type', 1, 1, $forceall);
 
 		echo '</span>';
 	}
 
 	// Predefined product/service
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 	{
 		if ($forceall >= 0 && $freelines) echo '<br>';
 		echo '<span class="prod_entry_mode_predef">';
 		echo '<label for="prod_entry_mode_predef">';
-		echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked':'').'> ';
+		echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode') == 'predef' ? ' checked' : '').'> ';
 		if (empty($senderissupplier))
 		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
-			else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
+			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
+			else if ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
 			else echo $langs->trans('PredefinedProductsAndServicesToSell');
 		}
 		else
 		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
-			else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
+			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
+			else if (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 			else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
 		}
 		echo '</label>';
 		echo ' ';
 
-		$filtertype='';
-		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
+		$filtertype = '';
+		if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype = '1';
 
 		if (empty($senderissupplier))
 		{
-			if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
+			if (!empty($conf->global->ENTREPOT_EXTRA_STATUS))
 			{
 				// hide products in closed warehouse, but show products for internal transfer
 				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
@@ -262,17 +262,17 @@ 
 			// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum
 		    if ($senderissupplier != 2)
 		    {
-    			$ajaxoptions=array(
-    					'update' => array('qty'=>'qty','remise_percent' => 'discount','idprod' => 'idprod'),	// html id tags that will be edited with which ajax json response key
-    					'option_disabled' => 'idthatdoesnotexists',					// html id to disable once select is done
+    			$ajaxoptions = array(
+    					'update' => array('qty'=>'qty', 'remise_percent' => 'discount', 'idprod' => 'idprod'), // html id tags that will be edited with which ajax json response key
+    					'option_disabled' => 'idthatdoesnotexists', // html id to disable once select is done
     					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
     			);
-    			$alsoproductwithnosupplierprice=0;
+    			$alsoproductwithnosupplierprice = 0;
 		    }
 		    else
 		    {
 		        $ajaxoptions = array();
-		        $alsoproductwithnosupplierprice=1;
+		        $alsoproductwithnosupplierprice = 1;
 		    }
 
 			$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1, $alsoproductwithnosupplierprice);
@@ -283,23 +283,23 @@ 
 
 	if (is_object($hookmanager) && empty($senderissupplier))
 	{
-        $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
-		$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+        $parameters = array('fk_parent_line'=>GETPOST('fk_parent_line', 'int'));
+		$reshook = $hookmanager->executeHooks('formCreateProductOptions', $parameters, $object, $action);
 		if (!empty($hookmanager->resPrint)) {
 			print $hookmanager->resPrint;
 		}
 	}
-	if (is_object($hookmanager) && ! empty($senderissupplier))
+	if (is_object($hookmanager) && !empty($senderissupplier))
 	{
-		$parameters=array('htmlname'=>'addproduct');
-		$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
+		$parameters = array('htmlname'=>'addproduct');
+		$reshook = $hookmanager->executeHooks('formCreateProductSupplierOptions', $parameters, $object, $action);
 		if (!empty($hookmanager->resPrint)) {
 			print $hookmanager->resPrint;
 		}
 	}
 
 
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 
 		if (!empty($conf->variants->enabled)) {
 			echo '<div id="attributes_box"></div>';
@@ -310,16 +310,16 @@ 
 
 	// Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$nbrows=ROWS_2;
-	$enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-	$toolbarname='dolibarr_details';
-	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-	$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%');
+	$nbrows = ROWS_2;
+	$enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+	if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+	$toolbarname = 'dolibarr_details';
+	if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+	$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc'), '', 100, $toolbarname, '', false, true, $enabled, $nbrows, '98%');
 	$doleditor->Create();
 
 	// Show autofill date for recuring invoices
-	if (! empty($conf->service->enabled) && $object->element == 'facturerec')
+	if (!empty($conf->service->enabled) && $object->element == 'facturerec')
 	{
 		echo '<div class="divlinefordates"><br>';
 		echo $langs->trans('AutoFillDateFrom').' ';
@@ -336,60 +336,60 @@ 
 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
 	{
 	?>
-		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref",'alpha',2):''); ?>"></td>
+		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"]) ?GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
 	<?php } ?>
 
 	<td class="nobottom linecolvat" align="right"><?php
 	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
-	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
+	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"]) ?GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);
 	?>
 	</td>
 	<td class="nobottom linecoluht" align="right">
-	<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"])?GETPOST("price_ht",'alpha',2):''); ?>">
+	<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"]) ?GETPOST("price_ht", 'alpha', 2) : ''); ?>">
 	</td>
 
-	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++;?>
+	<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { $colspan++; ?>
 	<td class="nobottom linecoluht_currency" align="right">
-	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"])?GETPOST("multicurrency_price_ht",'alpha',2):''); ?>">
+	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"]) ?GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">
 	</td>
 	<?php } ?>
 
-	<?php if (! empty($inputalsopricewithtax)) { ?>
+	<?php if (!empty($inputalsopricewithtax)) { ?>
 	<td class="nobottom linecoluttc" align="right">
-	<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (isset($_POST["price_ttc"])?GETPOST("price_ttc",'alpha',2):''); ?>">
+	<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (isset($_POST["price_ttc"]) ?GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
 	</td>
 	<?php } ?>
-	<td class="nobottom linecolqty" align="right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (isset($_POST["qty"])?GETPOST("qty",'alpha',2):1); ?>">
+	<td class="nobottom linecolqty" align="right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (isset($_POST["qty"]) ?GETPOST("qty", 'alpha', 2) : 1); ?>">
 	</td>
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
+	if ($conf->global->PRODUCT_USE_UNITS)
 	{
 		print '<td class="nobottom linecoluseunit" align="left">';
 		print $form->selectUnits($line->fk_unit, "units");
 		print '</td>';
 	}
 	$remise_percent = $buyer->remise_percent;
-	if($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
 		$remise_percent = $seller->remise_supplier_percent;
 	}
 	?>
-	<td class="nobottom nowrap linecoldiscount" align="right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (isset($_POST["remise_percent"])?GETPOST("remise_percent",'alpha',2):$remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
+	<td class="nobottom nowrap linecoldiscount" align="right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (isset($_POST["remise_percent"]) ?GETPOST("remise_percent", 'alpha', 2) : $remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
 		print '<td class="nobottom nowrap" align="right"><input class="falt right" type="text" size="1" value="0" name="progress">%</td>';
 	}
-	if (! empty($usemargins))
+	if (!empty($usemargins))
 	{
 		if (!empty($user->rights->margins->creer)) {
 		?>
 		<td align="right" class="nobottom margininfos linecolmargin">
 			<!-- For predef product -->
-			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
+			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input type="text" size="5" id="buying_price" name="buying_price" class="flat right" value="<?php echo (isset($_POST["buying_price"])?GETPOST("buying_price",'alpha',2):''); ?>">
+			<input type="text" size="5" id="buying_price" name="buying_price" class="flat right" value="<?php echo (isset($_POST["buying_price"]) ?GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 		</td>
 		<?php
 		$coldisplay++;
@@ -397,21 +397,21 @@ 
 
 		if ($user->rights->margins->creer)
 		{
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			{
-				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?GETPOST("np_marginRate",'alpha',2):'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
+				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
 			{
-				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
+				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
 		else
 		{
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $coldisplay++;
-			if (! empty($conf->global->DISPLAY_MARK_RATES))   $coldisplay++;
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) $coldisplay++;
+			if (!empty($conf->global->DISPLAY_MARK_RATES))   $coldisplay++;
 		}
 	}
 	?>
@@ -422,12 +422,12 @@ 
 
 <?php
 if (is_object($objectline)) {
-	print $objectline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $objectline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay + 8), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 }
 ?>
 
 <?php
-if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
+if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
 {
 	$colspan = 6;
 
@@ -465,35 +465,35 @@ 
 		}
 	}
 
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan += 2;
 
-	if (! empty($usemargins))
+	if (!empty($usemargins))
 	{
 		if (!empty($user->rights->margins->creer)) $colspan++; // For the buying price
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-		if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+		if (!empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
 	}
 	?>
 
 	<tr id="trlinefordates" <?php echo $bcnd[$var]; ?>>
-	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td></td>'; } ?>
+	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td></td>'; } ?>
 	<td colspan="<?php echo $colspan; ?>">
 	<?php
-	$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-	$date_end=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-	if (! empty($object->element) && $object->element == 'contrat')
+	$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+	$date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+	if (!empty($object->element) && $object->element == 'contrat')
 	{
 		print $langs->trans("DateStartPlanned").' ';
-		print $form->selectDate($date_start,"date_start",$usehm,$usehm,1,"addproduct");
+		print $form->selectDate($date_start, "date_start", $usehm, $usehm, 1, "addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
-		print $form->selectDate($date_end,"date_end",$usehm,$usehm,1,"addproduct");
+		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
 	}
 	else
 	{
 		echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
-		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
+		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 		echo ' '.$langs->trans('to').' ';
-		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
+		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 	};
 	print '<script type="text/javascript">';
 	if (!$date_start) {
@@ -523,20 +523,20 @@ 
 <script type="text/javascript">
 
 <?php
-if (! empty($usemargins) && $user->rights->margins->creer)
+if (!empty($usemargins) && $user->rights->margins->creer)
 {
 ?>
 
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
 		<?php
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
 			$("input[name='np_marginRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_marginRate");
 			});
 		<?php
 		}
-		if (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
+		if (!empty($conf->global->DISPLAY_MARK_RATES)) { ?>
 			$("input[name='np_markRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_markRate");
 			});
@@ -633,7 +633,7 @@ 
 	});
 
 	<?php
-	if(!$freelines) { ?>
+	if (!$freelines) { ?>
 		$("#prod_entry_mode_predef").click();
 	<?php
 	}
@@ -649,7 +649,7 @@ 
 		jQuery('#trlinefordates').show();
 
 		<?php
-		if (! empty($usemargins) && $user->rights->margins->creer)
+		if (!empty($usemargins) && $user->rights->margins->creer)
 		{
 			$langs->load('stocks');
 			?>

Braces +139 added lines, -75 removed lines

@@ -46,19 +46,36 @@ 
     $usemargins=1;
 }
 
-if (! isset($dateSelector)) global $dateSelector;	// Take global var only if not already defined into function calling (for example formAddObjectLine)
+if (! isset($dateSelector)) {
+    global $dateSelector;
+}
+// Take global var only if not already defined into function calling (for example formAddObjectLine)
 global $forceall, $forcetoshowtitlelines, $senderissupplier, $inputalsopricewithtax;
 
-if (! isset($dateSelector)) $dateSelector=1;    // For backward compatibility
-elseif (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (! isset($dateSelector)) {
+    $dateSelector=1;
+}
+// For backward compatibility
+elseif (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
 
 
 // Define colspan for button Add
 $colspan = 3;	// Col total ht + col edit + col delete
-if (in_array($object->element,array('propal','commande','order','facture','facturerec','invoice','supplier_proposal','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
+if (in_array($object->element,array('propal','commande','order','facture','facturerec','invoice','supplier_proposal','order_supplier','invoice_supplier'))) {
+    $colspan++;
+}
+// With this, there is a column move button
 //print $object->element;
 
 // Lines for extrafield
@@ -67,26 +84,19 @@ 
 {
 	if ($this->table_element_line=='commandedet') {
 		$objectline = new OrderLine($this->db);
-	}
-	elseif ($this->table_element_line=='propaldet') {
+	} elseif ($this->table_element_line=='propaldet') {
 		$objectline = new PropaleLigne($this->db);
-	}
-	elseif ($this->table_element_line=='supplier_proposaldet') {
+	} elseif ($this->table_element_line=='supplier_proposaldet') {
 		$objectline = new SupplierProposalLine($this->db);
-	}
-	elseif ($this->table_element_line=='facturedet') {
+	} elseif ($this->table_element_line=='facturedet') {
 		$objectline = new FactureLigne($this->db);
-	}
-	elseif ($this->table_element_line=='contratdet') {
+	} elseif ($this->table_element_line=='contratdet') {
 		$objectline = new ContratLigne($this->db);
-	}
-	elseif ($this->table_element_line=='commande_fournisseurdet') {
+	} elseif ($this->table_element_line=='commande_fournisseurdet') {
 		$objectline = new CommandeFournisseurLigne($this->db);
-	}
-	elseif ($this->table_element_line=='facture_fourn_det') {
+	} elseif ($this->table_element_line=='facture_fourn_det') {
 		$objectline = new SupplierInvoiceLine($this->db);
-	}
-	elseif ($this->table_element_line=='facturedet_rec') {
+	} elseif ($this->table_element_line=='facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
 	}
 }
@@ -106,10 +116,13 @@ 
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</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"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
+		<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef');
+	}
+	?></span></td>
 	<?php } ?>
 	<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 	<td class="linecoluht" align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
@@ -140,18 +153,24 @@ 
 		?>
 		<td align="right" class="margininfos linecolmargin1">
 		<?php
+		} else {
+		    $colspan++;
 		}
-		else $colspan++;
 
-		if ($conf->global->MARGIN_TYPE == "1")
-			echo $langs->trans('BuyingPrice');
-		else
-			echo $langs->trans('CostPrice');
+		if ($conf->global->MARGIN_TYPE == "1") {
+					echo $langs->trans('BuyingPrice');
+		} else {
+					echo $langs->trans('CostPrice');
+		}
 		?>
 		</td>
 		<?php
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		    echo '<td align="right" class="margininfos linecolmargin2"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
+		}
+		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) {
+		    echo '<td align="right" class="margininfos linecolmargin2"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+		}
 	}
 	?>
 	<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
@@ -167,8 +186,7 @@ 
 	?>
 	<td class="nobottom linecolnum" align="center" width="5"></td>
 	<?php
-}
-else {
+} else {
 	$coldisplay=0;
 }
 ?>
@@ -184,8 +202,13 @@ 
 		$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
 		if ($object->element == 'contrat')
 		{
-			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=3;
+			if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+			    $forceall=-1;
+			}
+			// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+			else if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+			    $forceall=3;
+			}
 		}
 
 		// Free line
@@ -202,15 +225,17 @@ 
 			echo $langs->trans("FreeLineOfType");
 			echo '</label>';
 			echo ' ';
-		}
-		else
+		} else
 		{
 			echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 			// Show type selector
 			if ($forceall >= 0)
 			{
-			    if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
-				else echo $langs->trans("FreeLineOfType");
+			    if (empty($conf->product->enabled) || empty($conf->service->enabled)) {
+			        echo $langs->trans("Type");
+			    } else {
+				    echo $langs->trans("FreeLineOfType");
+				}
 				echo ' ';
 			}
 		}
@@ -223,27 +248,38 @@ 
 	// Predefined product/service
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		if ($forceall >= 0 && $freelines) echo '<br>';
+		if ($forceall >= 0 && $freelines) {
+		    echo '<br>';
+		}
 		echo '<span class="prod_entry_mode_predef">';
 		echo '<label for="prod_entry_mode_predef">';
 		echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked':'').'> ';
 		if (empty($senderissupplier))
 		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
-			else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
-			else echo $langs->trans('PredefinedProductsAndServicesToSell');
-		}
-		else
+			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) {
+			    echo $langs->trans('PredefinedProductsToSell');
+			} else if ((empty($conf->product->enabled) && ! empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) {
+			    echo $langs->trans('PredefinedServicesToSell');
+			} else {
+			    echo $langs->trans('PredefinedProductsAndServicesToSell');
+			}
+		} else
 		{
-			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
-			else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
-			else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
+			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) {
+			    echo $langs->trans('PredefinedProductsToPurchase');
+			} else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) {
+			    echo $langs->trans('PredefinedServicesToPurchase');
+			} else {
+			    echo $langs->trans('PredefinedProductsAndServicesToPurchase');
+			}
 		}
 		echo '</label>';
 		echo ' ';
 
 		$filtertype='';
-		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
+		if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+		    $filtertype='1';
+		}
 
 		if (empty($senderissupplier))
 		{
@@ -251,13 +287,11 @@ 
 			{
 				// hide products in closed warehouse, but show products for internal transfer
 				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-			}
-			else
+			} else
 			{
 				$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array'));
 			}
-		}
-		else
+		} else
 		{
 			// $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum
 		    if ($senderissupplier != 2)
@@ -268,8 +302,7 @@ 
     					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for exemple shown we select a disabled option into combo)
     			);
     			$alsoproductwithnosupplierprice=0;
-		    }
-		    else
+		    } else
 		    {
 		        $ajaxoptions = array();
 		        $alsoproductwithnosupplierprice=1;
@@ -312,9 +345,13 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$nbrows=ROWS_2;
 	$enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+	    $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+	}
 	$toolbarname='dolibarr_details';
-	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+	    $toolbarname='dolibarr_notes';
+	}
 	$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%');
 	$doleditor->Create();
 
@@ -333,15 +370,21 @@ 
 	</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="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref",'alpha',2):''); ?>"></td>
+		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref",'alpha',2):'');
+	}
+	?>"></td>
 	<?php } ?>
 
 	<td class="nobottom linecolvat" align="right"><?php
-	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
-	else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
+	if ($seller->tva_assuj == "0") {
+	    echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
+	} else {
+	    echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?GETPOST("tva_tx",'alpha',2):-1), $seller, $buyer, 0, 0, '', false, 1);
+	}
 	?>
 	</td>
 	<td class="nobottom linecoluht" align="right">
@@ -407,11 +450,14 @@ 
 				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
-		}
-		else
+		} else
 		{
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $coldisplay++;
-			if (! empty($conf->global->DISPLAY_MARK_RATES))   $coldisplay++;
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			    $coldisplay++;
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			    $coldisplay++;
+			}
 		}
 	}
 	?>
@@ -427,14 +473,18 @@ 
 ?>
 
 <?php
-if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
+if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') {
+    // We show date field if required
 {
 	$colspan = 6;
+}
 
-	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
 	{
 		$colspan++;
 	}
+	}
 	if ($this->situation_cycle_ref) {
 		$colspan++;
 	}
@@ -465,13 +515,22 @@ 
 		}
 	}
 
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	    $colspan+=2;
+	}
 
 	if (! empty($usemargins))
 	{
-		if (!empty($user->rights->margins->creer)) $colspan++; // For the buying price
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-		if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
+		if (!empty($user->rights->margins->creer)) {
+		    $colspan++;
+		}
+		// For the buying price
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		    $colspan++;
+		}
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+		    $colspan++;
+		}
 	}
 	?>
 
@@ -487,8 +546,7 @@ 
 		print $form->selectDate($date_start,"date_start",$usehm,$usehm,1,"addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
 		print $form->selectDate($date_end,"date_end",$usehm,$usehm,1,"addproduct");
-	}
-	else
+	} else
 	{
 		echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
@@ -675,9 +733,15 @@ 
     	      		var defaultbuyprice = '<?php
     	      		if (isset($conf->global->MARGIN_TYPE))
     	      		{
-    	      		    if ($conf->global->MARGIN_TYPE == '1')   print 'bestsupplierprice';
-    	      		    if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
-    	      		    if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
+    	      		    if ($conf->global->MARGIN_TYPE == '1') {
+    	      		        print 'bestsupplierprice';
+    	      		    }
+    	      		    if ($conf->global->MARGIN_TYPE == 'pmp') {
+    	      		        print 'pmp';
+    	      		    }
+    	      		    if ($conf->global->MARGIN_TYPE == 'costprice') {
+    	      		        print 'costprice';
+    	      		    }
     	      		} ?>';
     	      		console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
 

dolibarr/htdocs/core/tpl/bloc_showhide.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
 // Protection to avoid direct call of template
 if (empty($blocname))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 $hide = true;	// Hide by default

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 	exit;
 }
 
-$hide = true;	// Hide by default
-if (isset($parameters['showblocbydefault'])) $hide=(empty($parameters['showblocbydefault']) ? true : false);
+$hide = true; // Hide by default
+if (isset($parameters['showblocbydefault'])) $hide = (empty($parameters['showblocbydefault']) ? true : false);
 if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
 
 ?>

Braces +6 added lines, -2 removed lines

@@ -25,8 +25,12 @@
 }
 
 $hide = true;	// Hide by default
-if (isset($parameters['showblocbydefault'])) $hide=(empty($parameters['showblocbydefault']) ? true : false);
-if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+if (isset($parameters['showblocbydefault'])) {
+    $hide=(empty($parameters['showblocbydefault']) ? true : false);
+}
+if (isset($object->extraparams[$blocname]['showhide'])) {
+    $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->