alxarafe / alixar

dolibarr/htdocs/societe/canvas/company/tpl/card_view.tpl.php

Indentation +21 added lines, -21 removed lines

@@ -18,8 +18,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -121,22 +121,22 @@ 
 
 <?php
 for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
-		echo '<td>'.$this->control->tpl['profid'.$i];
-		if ($this->control->tpl['profid'.$i]) {
-			if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
-			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
-		}
-		echo '</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	} else {
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>&nbsp;</td>';
-		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	}
+    if ($this->control->tpl['langprofid'.$i]!='-')	{
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
+        echo '<td>'.$this->control->tpl['profid'.$i];
+        if ($this->control->tpl['profid'.$i]) {
+            if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
+            else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+        }
+        echo '</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    } else {
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>&nbsp;</td>';
+        echo '<td>&nbsp;</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    }
 }
 ?>
 
@@ -153,9 +153,9 @@ 
 	<td><?php echo $langs->trans('Capital'); ?></td>
 	<td colspan="3">
 	<?php
-	if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
-	else echo '&nbsp;';
-	?>
+    if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
+    else echo '&nbsp;';
+    ?>
 	</td>
 </tr>
 

dolibarr/htdocs/societe/canvas/company/tpl/card_edit.tpl.php

Indentation +14 added lines, -14 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -111,7 +111,7 @@ 
 
 <?php
 if ($this->control->tpl['fournisseur']) {
-	if (count($this->control->tpl['suppliercategory']) > 0) { ?>
+    if (count($this->control->tpl['suppliercategory']) > 0) { ?>
 <tr>
 	<td><?php echo $langs->trans('SupplierCategory'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
@@ -163,17 +163,17 @@ 
 
 <?php
 for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
-		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	} else {
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>&nbsp;</td>';
-		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	}
+    if ($this->control->tpl['langprofid'.$i]!='-') {
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
+        echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    } else {
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>&nbsp;</td>';
+        echo '<td>&nbsp;</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    }
 }
 ?>
 

dolibarr/htdocs/societe/canvas/company/actions_card_company.class.php

Indentation +151 added lines, -151 removed lines

@@ -29,23 +29,23 @@ 
  */
 class ActionsCardCompany extends ActionsCardCommon
 {
-	/**
-	 *    Constructor
-	 *
+    /**
+     *    Constructor
+     *
      *    @param	DoliDB	$db				Handler acces base de donnees
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory of module where canvas is stored
      *    @param	string	$canvas			Name of canvas
      *    @param	string	$card			Name of tab (sub-canvas)
-	 */
-	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-	{
+     */
+    function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+    {
         $this->db				= $db;
         $this->dirmodule		= $dirmodule;
         $this->targetmodule		= $targetmodule;
         $this->canvas			= $canvas;
         $this->card				= $card;
-	}
+    }
 
     /**
      *  Return the title of card
@@ -68,155 +68,155 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
-	 *
-	 *    @param	string	$action    Type of action
-	 *    @param	integer	$id			Id of object
-	 *    @param	string	$ref		Ref of object
-	 *    @return	void
-	 */
-	function assign_values(&$action, $id=0, $ref='')
-	{
+    /**
+     *    Assign custom values for canvas (for example into this->tpl to be used by templates)
+     *
+     *    @param	string	$action    Type of action
+     *    @param	integer	$id			Id of object
+     *    @param	string	$ref		Ref of object
+     *    @return	void
+     */
+    function assign_values(&$action, $id=0, $ref='')
+    {
         // phpcs:enable
-		global $conf, $langs, $user, $mysoc;
-		global $form, $formadmin, $formcompany;
+        global $conf, $langs, $user, $mysoc;
+        global $form, $formadmin, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+        $ret = $this->getObject($id,$ref);
 
-		parent::assign_values($action);
+        parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
         $this->tpl['profid1'] 	= $this->object->idprof1;
-		$this->tpl['profid2'] 	= $this->object->idprof2;
-		$this->tpl['profid3'] 	= $this->object->idprof3;
-		$this->tpl['profid4'] 	= $this->object->idprof4;
-
-		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
-		{
-			$js = "\n";
-	        $js.= '<script language="JavaScript" type="text/javascript">';
-	        $js.= "function CheckVAT(a) {\n";
-	        $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js.= "}\n";
-	        $js.= '</script>';
-	        $js.= "\n";
-			$this->tpl['js_checkVatPopup'] = $js;
-		}
-
-		if ($action == 'create' || $action == 'edit')
-		{
-			for ($i=1; $i<=4; $i++)
-			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
-			}
-
-			// Type
-			$this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
-
-			// Juridical Status
-			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
-
-			// Workforce
-			$this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
-
-			// VAT intra
-			$s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-			if (empty($conf->global->MAIN_DISABLEVATCHECK))
-			{
-				$s.=' ';
-
-				if ($conf->use_javascript_ajax)
-				{
-					$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-					$this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-				}
-				else
-				{
-					$this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-				}
-			}
-			else
-			{
-				$this->tpl['tva_intra'] = $s;
-			}
-		}
-		else
-		{
-			// Confirm delete third party
-			if ($action == 'delete')
-			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
-			}
-
-			for ($i=1; $i<=4; $i++)
-			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
-				$this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
-			}
-
-			// TVA intra
-			if ($this->object->tva_intra)
-			{
-				$s=$this->object->tva_intra;
-				$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-				if (empty($conf->global->MAIN_DISABLEVATCHECK))
-				{
-					$s.=' &nbsp; ';
-
-					if ($conf->use_javascript_ajax)
-					{
-						$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-						$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-					}
-					else
-					{
-						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-					}
-				}
-				else
-				{
-					$this->tpl['tva_intra'] = $s;
-				}
-			}
-			else
-			{
-				$this->tpl['tva_intra'] = '&nbsp;';
-			}
-
-			// Parent company
-			if ($this->object->parent)
-			{
-				$socm = new Societe($this->db);
-				$socm->fetch($this->object->parent);
-				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
-				$this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
-			}
-			else
-			{
-				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
-			}
-		}
-	}
-
-	/**
-	 * 	Check permissions of a user to show a page and an object. Check read permission
-	 * 	If $_REQUEST['action'] defined, we also check write permission.
-	 *
-	 * 	@param      User	$user      	  	User to check
-	 * 	@param      string	$features	    Features to check (in most cases, it's module name)
-	 * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
-	 *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
-	 *  @param      string	$feature2		Feature to check (second level of permission)
-	 *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
-	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
-	 *  @return		int						1
-	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
-	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
-	}
+        $this->tpl['profid2'] 	= $this->object->idprof2;
+        $this->tpl['profid3'] 	= $this->object->idprof3;
+        $this->tpl['profid4'] 	= $this->object->idprof4;
+
+        if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
+        {
+            $js = "\n";
+            $js.= '<script language="JavaScript" type="text/javascript">';
+            $js.= "function CheckVAT(a) {\n";
+            $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+            $js.= "}\n";
+            $js.= '</script>';
+            $js.= "\n";
+            $this->tpl['js_checkVatPopup'] = $js;
+        }
+
+        if ($action == 'create' || $action == 'edit')
+        {
+            for ($i=1; $i<=4; $i++)
+            {
+                $this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
+                $this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
+            }
+
+            // Type
+            $this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
+
+            // Juridical Status
+            $this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
+
+            // Workforce
+            $this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
+
+            // VAT intra
+            $s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+            if (empty($conf->global->MAIN_DISABLEVATCHECK))
+            {
+                $s.=' ';
+
+                if ($conf->use_javascript_ajax)
+                {
+                    $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                    $this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                }
+                else
+                {
+                    $this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                }
+            }
+            else
+            {
+                $this->tpl['tva_intra'] = $s;
+            }
+        }
+        else
+        {
+            // Confirm delete third party
+            if ($action == 'delete')
+            {
+                $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
+            }
+
+            for ($i=1; $i<=4; $i++)
+            {
+                $this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
+                $this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
+                $this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
+            }
+
+            // TVA intra
+            if ($this->object->tva_intra)
+            {
+                $s=$this->object->tva_intra;
+                $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+                if (empty($conf->global->MAIN_DISABLEVATCHECK))
+                {
+                    $s.=' &nbsp; ';
+
+                    if ($conf->use_javascript_ajax)
+                    {
+                        $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                        $this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                    }
+                    else
+                    {
+                        $this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                    }
+                }
+                else
+                {
+                    $this->tpl['tva_intra'] = $s;
+                }
+            }
+            else
+            {
+                $this->tpl['tva_intra'] = '&nbsp;';
+            }
+
+            // Parent company
+            if ($this->object->parent)
+            {
+                $socm = new Societe($this->db);
+                $socm->fetch($this->object->parent);
+                $this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
+                $this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
+            }
+            else
+            {
+                $this->tpl['parent_company'] = $langs->trans("NoParentCompany");
+            }
+        }
+    }
+
+    /**
+     * 	Check permissions of a user to show a page and an object. Check read permission
+     * 	If $_REQUEST['action'] defined, we also check write permission.
+     *
+     * 	@param      User	$user      	  	User to check
+     * 	@param      string	$features	    Features to check (in most cases, it's module name)
+     * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
+     *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
+     *  @param      string	$feature2		Feature to check (second level of permission)
+     *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
+     *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
+     *  @return		int						1
+     */
+    function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+    {
+        return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+    }
 }

dolibarr/htdocs/societe/canvas/actions_card_common.class.php

Indentation +70 added lines, -70 removed lines

@@ -37,47 +37,47 @@ 
     var $canvas;
     var $card;
 
-	//! Template container
-	var $tpl = array();
-	//! Object container
-	var $object;
+    //! Template container
+    var $tpl = array();
+    //! Object container
+    var $object;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
 
-	/**
+    /**
      *  Get object from id or ref and save it into this->object
-	 *
+     *
      *  @param		int		$id			Object id
      *  @param		ref		$ref		Object ref
      *  @return		object				Object loaded
      */
     protected function getObject($id,$ref='')
     {
-    	//$ret = $this->getInstanceDao();
+        //$ret = $this->getInstanceDao();
 
-    	$object = new Societe($this->db);
-    	if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
-    	$this->object = $object;
+        $object = new Societe($this->db);
+        if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
+        $this->object = $object;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
-	 *
-	 *    @param	string	$action    Type of action
-	 *    @param	integer	$id			Id of object
-	 *    @param	string	$ref		Ref of object
-	 *    @return	void
+    /**
+     *    Assign custom values for canvas (for example into this->tpl to be used by templates)
+     *
+     *    @param	string	$action    Type of action
+     *    @param	integer	$id			Id of object
+     *    @param	string	$ref		Ref of object
+     *    @return	void
      */
     function assign_values(&$action, $id=0, $ref='')
     {
@@ -103,9 +103,9 @@ 
 
         if ($action == 'create')
         {
-        	if ($conf->use_javascript_ajax)
-			{
-				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
+            if ($conf->use_javascript_ajax)
+            {
+                $this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
 		              $("#radiocompany").click(function() {
                             document.formsoc.action.value="create";
@@ -121,14 +121,14 @@ 
                       });
 		          });
                 </script>'."\n";
-			}
+            }
         }
 
         if ($action == 'create' || $action == 'edit')
         {
-        	if ($conf->use_javascript_ajax)
-			{
-				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
+            if ($conf->use_javascript_ajax)
+            {
+                $this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
 						$("#selectcountry_id").change(function() {
 							document.formsoc.action.value="'.$action.'";
@@ -137,7 +137,7 @@ 
 						});
 					})
 				</script>'."\n";
-			}
+            }
 
             // Load object modCodeClient
             $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -173,35 +173,35 @@ 
 
             if (! empty($conf->fournisseur->enabled))
             {
-            	$this->tpl['supplier_enabled'] = 1;
-
-            	// Load object modCodeFournisseur
-            	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-            	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            	{
-            		$module = substr($module, 0, dol_strlen($module)-4);
-            	}
+                $this->tpl['supplier_enabled'] = 1;
+
+                // Load object modCodeFournisseur
+                $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+                if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+                {
+                    $module = substr($module, 0, dol_strlen($module)-4);
+                }
                 $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
                 foreach ($dirsociete as $dirroot)
                 {
                     $res=dol_include_once($dirroot.$module.'.php');
                     if ($res) break;
                 }
-            	$modCodeFournisseur = new $module;
-            	$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
-            	// We verified if the tag prefix is used
-            	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
-
-            	// Supplier
-            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
-            	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
-            	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
-            	$s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
-            	$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
-
-            	$this->object->LoadSupplierCateg();
-            	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
+                $modCodeFournisseur = new $module;
+                $this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
+                // We verified if the tag prefix is used
+                if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+
+                // Supplier
+                $this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
+                $this->tpl['suppliercode'] = $this->object->code_fournisseur;
+                if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
+                $this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
+                $s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
+                $this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
+
+                $this->object->LoadSupplierCateg();
+                $this->tpl['suppliercategory'] = $this->object->SupplierCategories;
             }
 
             // Zip
@@ -306,23 +306,23 @@ 
             $nbofsalesrepresentative=count($listsalesrepresentatives);
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
-            	$this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
-            	$this->tpl['sales_representatives'].= $nbofsalesrepresentative;
-            	$this->tpl['sales_representatives'].= '</a>';
+                $this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
+                $this->tpl['sales_representatives'].= $nbofsalesrepresentative;
+                $this->tpl['sales_representatives'].= '</a>';
             }
             else if ($nbofsalesrepresentative > 0)
             {
-            	$userstatic=new User($this->db);
-            	$i=0;
-            	foreach($listsalesrepresentatives as $val)
-            	{
-            		$userstatic->id=$val['id'];
-            		$userstatic->lastname=$val['name'];
-            		$userstatic->firstname=$val['firstname'];
-            		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
-            		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
-            	}
+                $userstatic=new User($this->db);
+                $i=0;
+                foreach($listsalesrepresentatives as $val)
+                {
+                    $userstatic->id=$val['id'];
+                    $userstatic->lastname=$val['name'];
+                    $userstatic->firstname=$val['firstname'];
+                    $this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
+                    $i++;
+                    if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+                }
             }
             else $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
 

dolibarr/htdocs/societe/canvas/individual/tpl/card_create.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>

dolibarr/htdocs/societe/canvas/individual/tpl/card_view.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 

dolibarr/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php

Indentation +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>
@@ -108,7 +108,7 @@ 
 
 <?php
 if ($this->control->tpl['fournisseur']) {
-	if (count($this->control->tpl['suppliercategory']) > 0) { ?>
+    if (count($this->control->tpl['suppliercategory']) > 0) { ?>
 <tr>
 	<td><?php echo $langs->trans('SupplierCategory'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>

dolibarr/htdocs/societe/canvas/individual/actions_card_individual.class.php

Indentation +66 added lines, -66 removed lines

@@ -29,22 +29,22 @@ 
 class ActionsCardIndividual extends ActionsCardCommon
 {
     /**
-	 *    Constructor
-	 *
+     *    Constructor
+     *
      *    @param	DoliDB	$db				Handler acces base de donnees
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory of module where canvas is stored
      *    @param	string	$canvas			Name of canvas
      *    @param	string	$card			Name of tab (sub-canvas)
      */
-	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-	{
-		$this->db				= $db;
-		$this->dirmodule		= $dirmodule;
-		$this->targetmodule		= $targetmodule;
+    function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+    {
+        $this->db				= $db;
+        $this->dirmodule		= $dirmodule;
+        $this->targetmodule		= $targetmodule;
         $this->canvas			= $canvas;
         $this->card				= $card;
-	}
+    }
 
 
     /**
@@ -67,73 +67,73 @@ 
     }
 
 
-	/**
-	 * Execute actions
+    /**
+     * Execute actions
      * @deprecated Use the doActions of hooks instead of this.
-	 *
-	 * @param	string	$action	Action
-	 * @param	int		$id			Id of object (may be empty for creation)
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function doActions(&$action, $id)
-	{
-		$ret = $this->getObject($id);
+     *
+     * @param	string	$action	Action
+     * @param	int		$id			Id of object (may be empty for creation)
+     * @return	int					<0 if KO, >0 if OK
+     */
+    function doActions(&$action, $id)
+    {
+        $ret = $this->getObject($id);
 
-		$return = parent::doActions($action);
+        $return = parent::doActions($action);
 
-		return $return;
-	}
+        return $return;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
-	 *
-	 *    @param	string	$action    Type of action
-	 *    @param	integer	$id			Id of object
-	 *    @param	string	$ref		Ref of object
-	 *    @return	void
-	 */
-	function assign_values(&$action, $id=0, $ref='')
-	{
+    /**
+     *    Assign custom values for canvas (for example into this->tpl to be used by templates)
+     *
+     *    @param	string	$action    Type of action
+     *    @param	integer	$id			Id of object
+     *    @param	string	$ref		Ref of object
+     *    @return	void
+     */
+    function assign_values(&$action, $id=0, $ref='')
+    {
         // phpcs:enable
-		global $conf, $langs;
-		global $form, $formcompany;
+        global $conf, $langs;
+        global $form, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+        $ret = $this->getObject($id,$ref);
 
-		parent::assign_values($action);
+        parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-		if ($action == 'create' || $action == 'edit')
-		{
-			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else
-		{
-			// Confirm delete third party
-			if ($action == 'delete' || $conf->use_javascript_ajax)
-			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteAnIndividual"),$langs->trans("ConfirmDeleteIndividual"),"confirm_delete",'',0,"1,action-delete");
-			}
-		}
-	}
-
-	/**
-	 * 	Check permissions of a user to show a page and an object. Check read permission
-	 * 	If $_REQUEST['action'] defined, we also check write permission.
-	 *
-	 * 	@param      User	$user      	  	User to check
-	 * 	@param      string	$features	    Features to check (in most cases, it's module name)
-	 * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
-	 *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
-	 *  @param      string	$feature2		Feature to check (second level of permission)
-	 *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
-	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
-	 *  @return		int						1
-	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
-	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
-	}
+        if ($action == 'create' || $action == 'edit')
+        {
+            $this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
+        }
+        else
+        {
+            // Confirm delete third party
+            if ($action == 'delete' || $conf->use_javascript_ajax)
+            {
+                $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteAnIndividual"),$langs->trans("ConfirmDeleteIndividual"),"confirm_delete",'',0,"1,action-delete");
+            }
+        }
+    }
+
+    /**
+     * 	Check permissions of a user to show a page and an object. Check read permission
+     * 	If $_REQUEST['action'] defined, we also check write permission.
+     *
+     * 	@param      User	$user      	  	User to check
+     * 	@param      string	$features	    Features to check (in most cases, it's module name)
+     * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
+     *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
+     *  @param      string	$feature2		Feature to check (second level of permission)
+     *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
+     *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
+     *  @return		int						1
+     */
+    function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+    {
+        return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+    }
 }

dolibarr/htdocs/societe/website.php

Indentation +153 added lines, -153 removed lines

@@ -72,36 +72,36 @@ 
 $search=array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
 }
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+    // If $val['visible']==0, then we never show the field
+    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
 }
 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
-	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-	}
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 
 if ($id > 0)
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
 }
 
 
@@ -128,17 +128,17 @@ 
     // Purge search criteria
     if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
     {
-    	foreach($objectwebsiteaccount->fields as $key => $val)
-    	{
-    		$search[$key]='';
-    	}
-    	$toselect='';
-    	$search_array_options=array();
+        foreach($objectwebsiteaccount->fields as $key => $val)
+        {
+            $search[$key]='';
+        }
+        $toselect='';
+        $search_array_options=array();
     }
     if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-    	|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
     {
-    	$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
     }
 
     // Mass actions
@@ -171,7 +171,7 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 foreach($search as $key => $val)
 {
-	$param.= '&search_'.$key.'='.urlencode($search[$key]);
+    $param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -194,25 +194,25 @@ 
 // Prefix
 if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
 {
-	print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
+    print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
 }
 
 if ($object->client) {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
-	print $object->code_client;
-	if ($object->check_codeclient() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
-	print '</td></tr>';
+    print '<tr><td class="titlefield">';
+    print $langs->trans('CustomerCode') . '</td><td colspan="3">';
+    print $object->code_client;
+    if ($object->check_codeclient() != 0)
+        print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+    print '</td></tr>';
 }
 
 if ($object->fournisseur) {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
-	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
-	print '</td></tr>';
+    print '<tr><td class="titlefield">';
+    print $langs->trans('SupplierCode') . '</td><td colspan="3">';
+    print $object->code_fournisseur;
+    if ($object->check_codefournisseur() != 0)
+        print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+    print '</td></tr>';
 }
 
 print '</table>';
@@ -223,15 +223,15 @@ 
 
 $newcardbutton = '';
 if (! empty($conf->website->enabled)) {
-	if (! empty($user->rights->societe->lire)) {
-		$newcardbutton .= '<a class="butActionNew" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'"><span class="valignmiddle">' . $langs->trans("AddWebsiteAccount").'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	} else {
-		$newcardbutton .= '<a class="butActionNewRefused" href="#">' . $langs->trans("AddAction");
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	}
+    if (! empty($user->rights->societe->lire)) {
+        $newcardbutton .= '<a class="butActionNew" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'"><span class="valignmiddle">' . $langs->trans("AddWebsiteAccount").'</span>';
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    } else {
+        $newcardbutton .= '<a class="butActionNewRefused" href="#">' . $langs->trans("AddAction");
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    }
 }
 
 print '<br>';
@@ -243,7 +243,7 @@ 
 $sql = 'SELECT ';
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+    $sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -259,8 +259,8 @@ 
 $sql.=" AND fk_soc = ".$object->id;
 foreach($search as $key => $val)
 {
-	$mode_search=(($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+    $mode_search=(($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key]))?1:0);
+    if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
 }
 if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
@@ -290,13 +290,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -304,8 +304,8 @@ 
 $resql=$db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -342,8 +342,8 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
 /*$moreforfilter = '';
@@ -358,9 +358,9 @@ 
 
 if (! empty($moreforfilter))
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -376,11 +376,11 @@ 
 print '<tr class="liste_titre">';
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    $align='';
+    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
+    if ($key == 'status') $align.=($align?' ':'').'center';
+    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -401,11 +401,11 @@ 
 print '<tr class="liste_titre">';
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    $align='';
+    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+    if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
+    if ($key == 'status') $align.=($align?' ':'').'center';
+    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 // Extra fields
@@ -422,7 +422,7 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
 }
 
 
@@ -432,90 +432,90 @@ 
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
-
-	// Store properties in $object
-	$objectwebsiteaccount->id = $obj->rowid;
-	foreach($objectwebsiteaccount->fields as $key => $val)
-	{
-		if (isset($obj->$key)) $objectwebsiteaccount->$key = $obj->$key;
-	}
-
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach($objectwebsiteaccount->fields as $key => $val)
-	{
-		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-		if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
-		if (! empty($arrayfields['t.'.$key]['checked']))
-		{
-			print '<td';
-			if ($align) print ' class="'.$align.'"';
-			print '>';
-			if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
-			else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! empty($val['isameasure']))
-			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-				$totalarray['val']['t.'.$key] += $obj->$key;
-			}
-		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print '</tr>';
-
-	$i++;
+    $obj = $db->fetch_object($resql);
+    if (empty($obj)) break;		// Should not happen
+
+    // Store properties in $object
+    $objectwebsiteaccount->id = $obj->rowid;
+    foreach($objectwebsiteaccount->fields as $key => $val)
+    {
+        if (isset($obj->$key)) $objectwebsiteaccount->$key = $obj->$key;
+    }
+
+    // Show here line of result
+    print '<tr class="oddeven">';
+    foreach($objectwebsiteaccount->fields as $key => $val)
+    {
+        $align='';
+        if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+        if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
+        if ($key == 'status') $align.=($align?' ':'').'center';
+        if (! empty($arrayfields['t.'.$key]['checked']))
+        {
+            print '<td';
+            if ($align) print ' class="'.$align.'"';
+            print '>';
+            if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
+            else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+            if (! empty($val['isameasure']))
+            {
+                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+                $totalarray['val']['t.'.$key] += $obj->$key;
+            }
+        }
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print '</tr>';
+
+    $i++;
 }
 
 // Show total line
 if (isset($totalarray['pos']))
 {
-	print '<tr class="liste_total">';
-	$i=0;
-	while ($i < $totalarray['nbfield'])
-	{
-		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
-		{
-			if ($i == 1)
-			{
-				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-			}
-			else print '<td></td>';
-		}
-	}
-	print '</tr>';
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield'])
+    {
+        $i++;
+        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+        else
+        {
+            if ($i == 1)
+            {
+                if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+                else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+            }
+            else print '<td></td>';
+        }
+    }
+    print '</tr>';
 }
 
 // If no record found
 if ($num == 0)
 {
-	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+    $colspan=1;
+    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
@@ -532,21 +532,21 @@ 
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	$hidegeneratedfilelistifempty=1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+    $hidegeneratedfilelistifempty=1;
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-	$formfile = new FormFile($db);
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+    $formfile = new FormFile($db);
 
-	// Show list of available documents
-	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-	$urlsource.=str_replace('&amp;','&',$param);
+    // Show list of available documents
+    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource.=str_replace('&amp;','&',$param);
 
-	$filedir=$diroutputmassaction;
-	$genallowed=$user->rights->mymodule->read;
-	$delallowed=$user->rights->mymodule->create;
+    $filedir=$diroutputmassaction;
+    $genallowed=$user->rights->mymodule->read;
+    $delallowed=$user->rights->mymodule->create;
 
-	print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
+    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 
 // End of page