alxarafe / alixar

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

dolibarr/htdocs/core/tpl/extrafields_list_print_fields.tpl.php

Indentation +37 added lines, -37 removed lines

@@ -3,8 +3,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
@@ -12,34 +12,34 @@ 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
 if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-	{
-		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
-			{
-				$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
-				print '<td';
-				if ($align) print ' align="'.$align.'"';
-				print '>';
-				$tmpkey='options_'.$key;
-				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
-				{
-					$datenotinstring = $obj->$tmpkey;
-					if (! is_numeric($obj->$tmpkey))	// For backward compatibility
-					{
-						$datenotinstring = $db->jdate($datenotinstring);
-					}
-					$value = $datenotinstring;
-				}
-				else
-				{
-					$value = $obj->$tmpkey;
-				}
+    if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    {
+        foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+                print '<td';
+                if ($align) print ' align="'.$align.'"';
+                print '>';
+                $tmpkey='options_'.$key;
+                if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
+                {
+                    $datenotinstring = $obj->$tmpkey;
+                    if (! is_numeric($obj->$tmpkey))	// For backward compatibility
+                    {
+                        $datenotinstring = $db->jdate($datenotinstring);
+                    }
+                    $value = $datenotinstring;
+                }
+                else
+                {
+                    $value = $obj->$tmpkey;
+                }
 
-				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
-				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
+                print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
 
                 if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
                     if (! $i) {
@@ -48,12 +48,12 @@ 
                     }
                     $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
                 }
-				if (! empty($val['isameasure']))
-				{
-					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
-					$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
-				}
-			}
-		}
-	}
+                if (! empty($val['isameasure']))
+                {
+                    if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+                    $totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
+                }
+            }
+        }
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 
 // 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;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
+			if (!empty($arrayfields["ef.".$key]['checked']))
 			{
-				$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+				$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				print '<td';
 				if ($align) print ' align="'.$align.'"';
 				print '>';
-				$tmpkey='options_'.$key;
+				$tmpkey = 'options_'.$key;
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
 				{
 					$datenotinstring = $obj->$tmpkey;
-					if (! is_numeric($obj->$tmpkey))	// For backward compatibility
+					if (!is_numeric($obj->$tmpkey))	// For backward compatibility
 					{
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
@@ -39,18 +39,18 @@ 
 
 				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
 				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['nbfield']++;
 
                 if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
-                    if (! $i) {
+                    if (!$i) {
                         // we keep position for the first line
                         $totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
                     }
                     $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
                 }
-				if (! empty($val['isameasure']))
+				if (!empty($val['isameasure']))
 				{
-					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+					if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'ef.'.$tmpkey;
 					$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
 				}
 			}

Braces +19 added lines, -8 removed lines

@@ -7,10 +7,13 @@ 
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+    $extrafieldsobjectkey=$object->table_element;
+}
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (! empty($extrafieldsobjectkey)) {
+    // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
@@ -19,27 +22,33 @@ 
 			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
 				$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+}
 				print '<td';
-				if ($align) print ' align="'.$align.'"';
+				if ($align) {
+				    print ' align="'.$align.'"';
+				}
 				print '>';
 				$tmpkey='options_'.$key;
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
 				{
 					$datenotinstring = $obj->$tmpkey;
-					if (! is_numeric($obj->$tmpkey))	// For backward compatibility
+					if (! is_numeric($obj->$tmpkey)) {
+					    // For backward compatibility
 					{
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
+					}
 					$value = $datenotinstring;
-				}
-				else
+				} else
 				{
 					$value = $obj->$tmpkey;
 				}
 
 				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
 				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
+				if (! $i) {
+				    $totalarray['nbfield']++;
+				}
 
                 if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
                     if (! $i) {
@@ -50,7 +59,9 @@ 
                 }
 				if (! empty($val['isameasure']))
 				{
-					if (! $i) $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+					if (! $i) {
+					    $totalarray['pos'][$totalarray['nbfield']]='ef.'.$tmpkey;
+					}
 					$totalarray['val']['ef.'.$tmpkey] += $obj->$tmpkey;
 				}
 			}

dolibarr/htdocs/core/tpl/contacts.tpl.php

Indentation +76 added lines, -76 removed lines

@@ -24,8 +24,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;
 }
 
 
@@ -46,11 +46,11 @@ 
 elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
 elseif (! isset($permission) && isset($user->rights->$module->creer))
 {
-	$permission=$user->rights->$module->creer;
+    $permission=$user->rights->$module->creer;
 }
 elseif (! isset($permission)  && isset($user->rights->$module->write))
 {
-	$permission=$user->rights->$module->write;
+    $permission=$user->rights->$module->write;
 }
 
 $formcompany= new FormCompany($db);
@@ -79,10 +79,10 @@ 
 
 	<?php
 
-	if (empty($hideaddcontactforuser))
-	{
+    if (empty($hideaddcontactforuser))
+    {
 
-	?>
+    ?>
 	<form class="tagtr impair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
@@ -94,21 +94,21 @@ 
 		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
-		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
-		?></div>
+        $tmpobject=$object;
+        if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+        echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
+        ?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
 
 	<?php
-	}
+    }
 
-	if (empty($hideaddcontactforthirdparty))
-	{
+    if (empty($hideaddcontactforthirdparty))
+    {
 
-	?>
+    ?>
 
 	<form class="tagtr pair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -120,12 +120,12 @@ 
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
 			<?php
-			// add company icon before select list
-			if ($selectedCompany)
-			{
-			    echo img_object('', 'company', 'class="hideonsmartphone"');
-			}
-			?>
+            // add company icon before select list
+            if ($selectedCompany)
+            {
+                echo img_object('', 'company', 'class="hideonsmartphone"');
+            }
+            ?>
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
@@ -133,9 +133,9 @@ 
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
-			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
+            $tmpobject=$object;
+            if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+            $formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
@@ -144,7 +144,7 @@ 
 	</form>
 
 <?php
-	}
+    }
 }
 ?>
 
@@ -158,18 +158,18 @@ 
 	</form>
 
 	<?php
-	$arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
-	foreach($arrayofsource as $source) {
+    $arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
+    foreach($arrayofsource as $source) {
 
-		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+        $tmpobject=$object;
+        if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
 
-		$tab = $tmpobject->liste_contact(-1,$source);
-		$num=count($tab);
+        $tab = $tmpobject->liste_contact(-1,$source);
+        $num=count($tab);
 
-		$i = 0;
-		while ($i < $num) {
-	?>
+        $i = 0;
+        while ($i < $num) {
+    ?>
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
@@ -178,50 +178,50 @@ 
 		</div>
 		<div class="tagtd" align="left">
 			<?php
-			if ($tab[$i]['socid'] > 0)
-			{
-				$companystatic->fetch($tab[$i]['socid']);
-				echo $companystatic->getNomUrl(1);
-			}
-			if ($tab[$i]['socid'] < 0)
-			{
-				echo $conf->global->MAIN_INFO_SOCIETE_NOM;
-			}
-			if (! $tab[$i]['socid'])
-			{
-				echo '&nbsp;';
-			}
-			?>
+            if ($tab[$i]['socid'] > 0)
+            {
+                $companystatic->fetch($tab[$i]['socid']);
+                echo $companystatic->getNomUrl(1);
+            }
+            if ($tab[$i]['socid'] < 0)
+            {
+                echo $conf->global->MAIN_INFO_SOCIETE_NOM;
+            }
+            if (! $tab[$i]['socid'])
+            {
+                echo '&nbsp;';
+            }
+            ?>
 		</div>
 		<div class="tagtd">
 			<?php
-			$statusofcontact = $tab[$i]['status'];
-
-			if ($tab[$i]['source']=='internal')
-			{
-				$userstatic->fetch($tab[$i]['id']);
-				echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
-			}
-			if ($tab[$i]['source']=='external')
-			{
-				$contactstatic->fetch($tab[$i]['id']);
-				echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
-			}
-			?>
+            $statusofcontact = $tab[$i]['status'];
+
+            if ($tab[$i]['source']=='internal')
+            {
+                $userstatic->fetch($tab[$i]['id']);
+                echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
+            }
+            if ($tab[$i]['source']=='external')
+            {
+                $contactstatic->fetch($tab[$i]['id']);
+                echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
+            }
+            ?>
 		</div>
 		<div class="tagtd"><?php echo $tab[$i]['libelle']; ?></div>
 		<div class="tagtd center">
 			<?php //if ($object->statut >= 0) echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">'; ?>
 			<?php
-			if ($tab[$i]['source']=='internal')
-			{
-				echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
-			}
-			if ($tab[$i]['source']=='external')
-			{
-				echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
-			}
-			?>
+            if ($tab[$i]['source']=='internal')
+            {
+                echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
+            }
+            if ($tab[$i]['source']=='external')
+            {
+                echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
+            }
+            ?>
 			<?php //if ($object->statut >= 0) echo '</a>'; ?>
 		</div>
 		<div class="tagtd nowrap right">
@@ -238,11 +238,11 @@ 
 </div>
 <!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->
 <?php
-	if (is_object($hookmanager))
-	{
-		$hookmanager->initHooks(array('contacttpl'));
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
-	}
+    if (is_object($hookmanager))
+    {
+        $hookmanager->initHooks(array('contacttpl'));
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
+    }
 ?>
 <!-- END PHP TEMPLATE CONTACTS -->

Spacing +47 added lines, -47 removed lines

@@ -22,7 +22,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;
@@ -35,28 +35,28 @@ 
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal')				{ $permission=$user->rights->propale->creer; }
-elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; }
-elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; }
-elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; }
-elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
-elseif (! isset($permission) && isset($user->rights->$module->creer))
+if ($module == 'propal') { $permission = $user->rights->propale->creer; }
+elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
+elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
+elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
+elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
+elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; }
+elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
+elseif ($module == 'reception') { $permission = $user->rights->reception->creer; }
+elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
+elseif (!isset($permission) && isset($user->rights->$module->creer))
 {
-	$permission=$user->rights->$module->creer;
+	$permission = $user->rights->$module->creer;
 }
-elseif (! isset($permission)  && isset($user->rights->$module->write))
+elseif (!isset($permission) && isset($user->rights->$module->write))
 {
-	$permission=$user->rights->$module->write;
+	$permission = $user->rights->$module->write;
 }
 
-$formcompany= new FormCompany($db);
-$companystatic=new Societe($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$formcompany = new FormCompany($db);
+$companystatic = new Societe($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 ?>
 
@@ -89,14 +89,14 @@ 
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="internal" />
 	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="nowrap tagtd"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></div>
+		<div class="nowrap tagtd"><?php echo img_object('', 'user').' '.$langs->trans("Users"); ?></div>
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
-		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
+		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
-		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
+		$tmpobject = $object;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
+		echo $formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
@@ -116,9 +116,9 @@ 
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
 	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="tagtd nowrap noborderbottom"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
+		<div class="tagtd nowrap noborderbottom"><?php echo img_object('', 'contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
-			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
+			<?php $selectedCompany = isset($_GET["newcompany"]) ? $_GET["newcompany"] : $object->socid; ?>
 			<?php
 			// add company icon before select list
 			if ($selectedCompany)
@@ -129,17 +129,17 @@ 
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
-			<?php $nbofcontacts=$form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 0, 'minwidth100imp'); ?>
+			<?php $nbofcontacts = $form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
-			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
+			$tmpobject = $object;
+			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
+			$formcompany->selectTypeContact($tmpobject, '', 'type', 'external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>>
+			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) echo ' disabled'; ?>>
 		</div>
 	</form>
 
@@ -158,14 +158,14 @@ 
 	</form>
 
 	<?php
-	$arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
-	foreach($arrayofsource as $source) {
+	$arrayofsource = array('internal', 'external'); // Show both link to user and thirdparties contacts
+	foreach ($arrayofsource as $source) {
 
-		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		$tmpobject = $object;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
 
-		$tab = $tmpobject->liste_contact(-1,$source);
-		$num=count($tab);
+		$tab = $tmpobject->liste_contact(-1, $source);
+		$num = count($tab);
 
 		$i = 0;
 		while ($i < $num) {
@@ -173,8 +173,8 @@ 
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
-			<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
-			<?php if ($tab[$i]['source']=='external') echo $langs->trans("ThirdPartyContact"); ?>
+			<?php if ($tab[$i]['source'] == 'internal') echo $langs->trans("User"); ?>
+			<?php if ($tab[$i]['source'] == 'external') echo $langs->trans("ThirdPartyContact"); ?>
 		</div>
 		<div class="tagtd" align="left">
 			<?php
@@ -187,7 +187,7 @@ 
 			{
 				echo $conf->global->MAIN_INFO_SOCIETE_NOM;
 			}
-			if (! $tab[$i]['socid'])
+			if (!$tab[$i]['socid'])
 			{
 				echo '&nbsp;';
 			}
@@ -197,12 +197,12 @@ 
 			<?php
 			$statusofcontact = $tab[$i]['status'];
 
-			if ($tab[$i]['source']=='internal')
+			if ($tab[$i]['source'] == 'internal')
 			{
 				$userstatic->fetch($tab[$i]['id']);
 				echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			}
-			if ($tab[$i]['source']=='external')
+			if ($tab[$i]['source'] == 'external')
 			{
 				$contactstatic->fetch($tab[$i]['id']);
 				echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
@@ -213,13 +213,13 @@ 
 		<div class="tagtd center">
 			<?php //if ($object->statut >= 0) echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">'; ?>
 			<?php
-			if ($tab[$i]['source']=='internal')
+			if ($tab[$i]['source'] == 'internal')
 			{
-				echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
+				echo $userstatic->LibStatut($tab[$i]['statuscontact'], 3);
 			}
-			if ($tab[$i]['source']=='external')
+			if ($tab[$i]['source'] == 'external')
 			{
-				echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
+				echo $contactstatic->LibStatut($tab[$i]['statuscontact'], 3);
 			}
 			?>
 			<?php //if ($object->statut >= 0) echo '</a>'; ?>
@@ -241,8 +241,8 @@ 
 	if (is_object($hookmanager))
 	{
 		$hookmanager->initHooks(array('contacttpl'));
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
 	}
 ?>
 <!-- END PHP TEMPLATE CONTACTS -->

Braces +31 added lines, -20 removed lines

@@ -35,20 +35,10 @@ 
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal')				{ $permission=$user->rights->propale->creer; }
-elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; }
-elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; }
-elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; }
-elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
-elseif (! isset($permission) && isset($user->rights->$module->creer))
+if ($module == 'propal')				{ $permission=$user->rights->propale->creer; } elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; } elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; } elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; } elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; } elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; } elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; } elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; } elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; } elseif (! isset($permission) && isset($user->rights->$module->creer))
 {
 	$permission=$user->rights->$module->creer;
-}
-elseif (! isset($permission)  && isset($user->rights->$module->write))
+} elseif (! isset($permission)  && isset($user->rights->$module->write))
 {
 	$permission=$user->rights->$module->write;
 }
@@ -88,14 +78,19 @@ 
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="internal" />
-	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+	<?php if ($withproject) {
+    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+}
+?>
 		<div class="nowrap tagtd"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></div>
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
 		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
 		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
+		    $tmpobject=$objectsrc;
+		}
 		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
@@ -115,7 +110,10 @@ 
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
-	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+	<?php if ($withproject) {
+    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+}
+?>
 		<div class="tagtd nowrap noborderbottom"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
@@ -134,12 +132,17 @@ 
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
 			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) {
+			    $tmpobject=$objectsrc;
+			}
 			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>>
+			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) {
+    echo ' disabled';
+}
+?>>
 		</div>
 	</form>
 
@@ -162,7 +165,9 @@ 
 	foreach($arrayofsource as $source) {
 
 		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) {
+		    $tmpobject=$objectsrc;
+		}
 
 		$tab = $tmpobject->liste_contact(-1,$source);
 		$num=count($tab);
@@ -173,8 +178,14 @@ 
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
-			<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
-			<?php if ($tab[$i]['source']=='external') echo $langs->trans("ThirdPartyContact"); ?>
+			<?php if ($tab[$i]['source']=='internal') {
+    echo $langs->trans("User");
+}
+?>
+			<?php if ($tab[$i]['source']=='external') {
+    echo $langs->trans("ThirdPartyContact");
+}
+?>
 		</div>
 		<div class="tagtd" align="left">
 			<?php

dolibarr/htdocs/core/tpl/card_presend.tpl.php

Indentation +185 added lines, -185 removed lines

@@ -29,203 +29,203 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
 if ($action == 'presend')
 {
-	$langs->load("mails");
-
-	$titreform='SendMail';
-
-	$object->fetch_projet();
-
-	if (! in_array($object->element, array('societe', 'user', 'member')))
-	{
-		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		//
-		if ($object->element == 'invoice_supplier')
-		{
-			$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
-		}
-
-		$file = $fileparams['fullname'];
-	}
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-	{
-		$newlang = $_REQUEST['lang_id'];
-	}
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-	{
-		$newlang = $object->thirdparty->default_lang;
-	}
-
-	if (!empty($newlang))
-	{
-		$outputlangs = new Translate('', $conf);
-		$outputlangs->setDefaultLang($newlang);
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
-	}
-
-	$topicmail='';
-	if (empty($object->ref_client)) {
-		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
-	} else if (! empty($object->ref_client)) {
-		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
-	}
-
-	// Build document if it not exists
-	if (! in_array($object->element, array('societe', 'user', 'member')))
-	{
-		if ((! $file || ! is_readable($file)) && method_exists($object, 'generateDocument'))
-		{
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-	}
-
-	print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-	print '<div class="clearboth"></div>';
-	print '<br>';
-	print load_fiche_titre($langs->trans($titreform));
-
-	dol_fiche_head('');
-
-	// Create form for email
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-
-	$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-	$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;
-
-	// Fill list of recipient with email inside <>.
-	$liste = array();
-	if ($object->element == 'expensereport')
-	{
-		$fuser = new User($db);
-		$fuser->fetch($object->fk_user_author);
-		$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
-	{
-		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
-			$liste[$key] = $value;
-		}
-	}
-	elseif ($object->element == 'contact')
-	{
-		$liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
-	{
-		$liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	else
-	{
-		if (is_object($object->thirdparty))
-		{
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
-				$liste[$key] = $value;
-			}
-		}
-	}
-	if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-		$listeuser=array();
-		$fuserdest = new User($db);
-
-		$result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
-		if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
-			foreach($fuserdest->users as $uuserdest) {
-				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
-			}
-		} elseif ($result<0) {
-			setEventMessages(null, $fuserdest->errors,'errors');
-		}
-		if (count($listeuser)>0) {
-			$formmail->withtouser = $listeuser;
-			$formmail->withtoccuser = $listeuser;
-		}
-	}
-
-	$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-	$formmail->withtocc = $liste;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $topicmail;
-	$formmail->withfile = 2;
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
-	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
-
-	// Make substitution in email content
-	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-	$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, $outputlangs, $object, $parameters);
-
-	// Find the good contact adress
-	$custcontact = '';
-	$contactarr = array();
-	$contactarr = $object->liste_contact(- 1, 'external');
-
-	if (is_array($contactarr) && count($contactarr) > 0) {
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+    $langs->load("mails");
+
+    $titreform='SendMail';
+
+    $object->fetch_projet();
+
+    if (! in_array($object->element, array('societe', 'user', 'member')))
+    {
+        // TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
+
+        $ref = dol_sanitizeFileName($object->ref);
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+        //
+        if ($object->element == 'invoice_supplier')
+        {
+            $fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+        }
+
+        $file = $fileparams['fullname'];
+    }
+
+    // Define output language
+    $outputlangs = $langs;
+    $newlang = '';
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+    {
+        $newlang = $_REQUEST['lang_id'];
+    }
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+    {
+        $newlang = $object->thirdparty->default_lang;
+    }
+
+    if (!empty($newlang))
+    {
+        $outputlangs = new Translate('', $conf);
+        $outputlangs->setDefaultLang($newlang);
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
+    }
+
+    $topicmail='';
+    if (empty($object->ref_client)) {
+        $topicmail = $outputlangs->trans($defaulttopic, '__REF__');
+    } else if (! empty($object->ref_client)) {
+        $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
+    }
+
+    // Build document if it not exists
+    if (! in_array($object->element, array('societe', 'user', 'member')))
+    {
+        if ((! $file || ! is_readable($file)) && method_exists($object, 'generateDocument'))
+        {
+            $result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            if ($result <= 0) {
+                dol_print_error($db, $object->error, $object->errors);
+                exit();
+            }
+            $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+            $file = $fileparams['fullname'];
+        }
+    }
+
+    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+    print '<div class="clearboth"></div>';
+    print '<br>';
+    print load_fiche_titre($langs->trans($titreform));
+
+    dol_fiche_head('');
+
+    // Create form for email
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+
+    $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+    $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;
+
+    // Fill list of recipient with email inside <>.
+    $liste = array();
+    if ($object->element == 'expensereport')
+    {
+        $fuser = new User($db);
+        $fuser->fetch($object->fk_user_author);
+        $liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
+    }
+    elseif ($object->element == 'societe')
+    {
+        foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
+            $liste[$key] = $value;
+        }
+    }
+    elseif ($object->element == 'contact')
+    {
+        $liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
+    }
+    elseif ($object->element == 'user' || $object->element == 'member')
+    {
+        $liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
+    }
+    else
+    {
+        if (is_object($object->thirdparty))
+        {
+            foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
+                $liste[$key] = $value;
+            }
+        }
+    }
+    if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+        $listeuser=array();
+        $fuserdest = new User($db);
+
+        $result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
+        if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
+            foreach($fuserdest->users as $uuserdest) {
+                $listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
+            }
+        } elseif ($result<0) {
+            setEventMessages(null, $fuserdest->errors,'errors');
+        }
+        if (count($listeuser)>0) {
+            $formmail->withtouser = $listeuser;
+            $formmail->withtoccuser = $listeuser;
+        }
+    }
+
+    $formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+    $formmail->withtocc = $liste;
+    $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+    $formmail->withtopic = $topicmail;
+    $formmail->withfile = 2;
+    $formmail->withbody = 1;
+    $formmail->withdeliveryreceipt = 1;
+    $formmail->withcancel = 1;
+
+    //$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
+    if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+
+    // Make substitution in email content
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
+    $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, $outputlangs, $object, $parameters);
+
+    // Find the good contact adress
+    $custcontact = '';
+    $contactarr = array();
+    $contactarr = $object->liste_contact(- 1, 'external');
+
+    if (is_array($contactarr) && count($contactarr) > 0) {
+        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
         $contactstatic = new Contact($db);
 
-		foreach ($contactarr as $contact) {
+        foreach ($contactarr as $contact) {
             $contactstatic->fetch($contact['id']);
             $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($langs, 1);
-		}
-	}
+        }
+    }
 
-	// Tableau des substitutions
-	$formmail->substit = $substitutionarray;
+    // Tableau des substitutions
+    $formmail->substit = $substitutionarray;
 
-	// Tableau des parametres complementaires
-	$formmail->param['action'] = 'send';
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id']=GETPOST('modelmailselected','int');
-	$formmail->param['id'] = $object->id;
-	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-	$formmail->param['fileinit'] = array($file);
+    // Tableau des parametres complementaires
+    $formmail->param['action'] = 'send';
+    $formmail->param['models'] = $modelmail;
+    $formmail->param['models_id']=GETPOST('modelmailselected','int');
+    $formmail->param['id'] = $object->id;
+    $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+    $formmail->param['fileinit'] = array($file);
 
-	// Show form
-	print $formmail->get_form();
+    // Show form
+    print $formmail->get_form();
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 

Spacing +34 added lines, -34 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;
@@ -38,21 +38,21 @@ 
 {
 	$langs->load("mails");
 
-	$titreform='SendMail';
+	$titreform = 'SendMail';
 
 	$object->fetch_projet();
 
-	if (! in_array($object->element, array('societe', 'user', 'member')))
+	if (!in_array($object->element, array('societe', 'user', 'member')))
 	{
 		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
 
 		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		//
 		if ($object->element == 'invoice_supplier')
 		{
-			$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 		}
 
 		$file = $fileparams['fullname'];
@@ -61,7 +61,7 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id']))
 	{
 		$newlang = $_REQUEST['lang_id'];
 	}
@@ -75,27 +75,27 @@ 
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
 		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
+		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions'));
 	}
 
-	$topicmail='';
+	$topicmail = '';
 	if (empty($object->ref_client)) {
 		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
-	} else if (! empty($object->ref_client)) {
+	} else if (!empty($object->ref_client)) {
 		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
 	}
 
 	// Build document if it not exists
-	if (! in_array($object->element, array('societe', 'user', 'member')))
+	if (!in_array($object->element, array('societe', 'user', 'member')))
 	{
-		if ((! $file || ! is_readable($file)) && method_exists($object, 'generateDocument'))
+		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument'))
 		{
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				dol_print_error($db, $object->error, $object->errors);
 				exit();
 			}
-			$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			$file = $fileparams['fullname'];
 		}
 	}
@@ -108,21 +108,21 @@ 
 	dol_fiche_head('');
 
 	// Create form for email
-	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->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-	$formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+	$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
+	$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
+	$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->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
 
@@ -158,18 +158,18 @@ 
 		}
 	}
 	if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-		$listeuser=array();
+		$listeuser = array();
 		$fuserdest = new User($db);
 
-		$result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
-		if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
-			foreach($fuserdest->users as $uuserdest) {
-				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
+		$result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
+		if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) {
+			foreach ($fuserdest->users as $uuserdest) {
+				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email');
 			}
-		} elseif ($result<0) {
-			setEventMessages(null, $fuserdest->errors,'errors');
+		} elseif ($result < 0) {
+			setEventMessages(null, $fuserdest->errors, 'errors');
 		}
-		if (count($listeuser)>0) {
+		if (count($listeuser) > 0) {
 			$formmail->withtouser = $listeuser;
 			$formmail->withtoccuser = $listeuser;
 		}
@@ -185,12 +185,12 @@ 
 	$formmail->withcancel = 1;
 
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+	if (!isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude = null;
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-	$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(
 		'mode' => 'formemail'
@@ -200,10 +200,10 @@ 
 	// Find the good contact adress
 	$custcontact = '';
 	$contactarr = array();
-	$contactarr = $object->liste_contact(- 1, 'external');
+	$contactarr = $object->liste_contact(-1, 'external');
 
 	if (is_array($contactarr) && count($contactarr) > 0) {
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contactstatic = new Contact($db);
 
 		foreach ($contactarr as $contact) {
@@ -218,9 +218,9 @@ 
 	// Tableau des parametres complementaires
 	$formmail->param['action'] = 'send';
 	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id']=GETPOST('modelmailselected','int');
+	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
 	$formmail->param['id'] = $object->id;
-	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"].'?id='.$object->id;
 	$formmail->param['fileinit'] = array($file);
 
 	// Show form

Braces +10 added lines, -10 removed lines

@@ -119,9 +119,11 @@ 
 		$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;
@@ -133,22 +135,18 @@ 
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
+	} elseif ($object->element == 'societe')
 	{
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
 		}
-	}
-	elseif ($object->element == 'contact')
+	} elseif ($object->element == 'contact')
 	{
 		$liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
+	} elseif ($object->element == 'user' || $object->element == 'member')
 	{
 		$liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	else
+	} else
 	{
 		if (is_object($object->thirdparty))
 		{
@@ -185,7 +183,9 @@ 
 	$formmail->withcancel = 1;
 
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+	if (! isset($arrayoffamiliestoexclude)) {
+	    $arrayoffamiliestoexclude=null;
+	}
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);

dolibarr/htdocs/core/tpl/admin_extrafields_add.tpl.php

Indentation +13 added lines, -13 removed lines

@@ -30,8 +30,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;
 }
 
 
@@ -55,17 +55,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') == "separate")
-    		{
-				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			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();';
+            }
+            ?>
 
     		// Case of computed field
     		console.log(type);

Spacing +24 added lines, -24 removed lines

@@ -28,7 +28,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;
@@ -55,12 +55,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();';
@@ -126,7 +126,7 @@ 
 				langfile.removeAttr('disabled');required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
     	}
-    	init_typeoffields('<?php echo GETPOST('type','alpha'); ?>');
+    	init_typeoffields('<?php echo GETPOST('type', 'alpha'); ?>');
     	jQuery("#type").change(function() {
     		init_typeoffields($(this).val());
     	});
@@ -146,15 +146,15 @@ 
 
 <table summary="listofattributes" class="border centpercent">
 <!-- Label -->
-<tr><td class="titlefield fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label','alpha'); ?>"></td></tr>
+<tr><td class="titlefield fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label', 'alpha'); ?>"></td></tr>
 <!-- Code -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname','alpha'); ?>"> (<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</td></tr>
+<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>"> (<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</td></tr>
 <!-- Type -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
-<?php print $form->selectarray('type',$type2label,GETPOST('type','alpha')); ?>
+<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha')); ?>
 </td></tr>
 <!-- Size -->
-<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size','alpha')?GETPOST('size','alpha'):''); ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size', 'alpha') ?GETPOST('size', 'alpha') : ''); ?>"></td></tr>
 <!-- Default Value (for select list / radio/ checkbox) -->
 <tr id="value_choice">
 <td>
@@ -163,41 +163,41 @@ 
 <td>
     <table class="nobordernopadding">
     <tr><td>
-    	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param','alpha'); ?></textarea>
+    	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></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 GETPOSTISSET('pos')?GETPOST('pos','int'):100; ?>"></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 GETPOSTISSET('pos') ?GETPOST('pos', 'int') : 100; ?>"></td></tr>
 <!-- Language file -->
-<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile','alpha')); ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></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" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value','none')?GETPOST('computed_value','none'):''); ?>"></td></tr>
+<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" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?>"></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 (GETPOST('default_value','alpha')?GETPOST('default_value','alpha'):''); ?>"></td></tr>
+<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 (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></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 (GETPOST('unique','alpha')?' 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 (GETPOST('unique', 'alpha') ? ' 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 (GETPOST('required','alpha')?' 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 (GETPOST('required', 'alpha') ? ' 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 ((GETPOST('alwayseditable','alpha') || ! GETPOST('button','alpha'))?' 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 ((GETPOST('alwayseditable', 'alpha') || !GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
 <!-- Visibility -->
 <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 GETPOST('list','int')!='' ? GETPOST('list','int') : '1'; ?>"></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list', 'int') != '' ? GETPOST('list', 'int') : '1'; ?>"></td></tr>
 <!-- Totalizable -->
-<tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ((GETPOST('totalizable','alpha') || GETPOST('button','alpha'))?' checked':''); ?>></td></tr>
+<tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ((GETPOST('totalizable', 'alpha') || GETPOST('button', 'alpha')) ? ' 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 (GETPOST('entitycurrentorall','alpha') ? '':' checked'); ?>></td></tr>
+    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall', 'alpha') ? '' : ' checked'); ?>></td></tr>
 <?php } ?>
 </table>