alxarafe / alixar

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

Braces +16 added lines, -17 removed lines

@@ -59,9 +59,15 @@ 
 
         $out='';
 
-        if ($action == 'view')      $out.= $langs->trans("ThirdParty");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view') {
+            $out.= $langs->trans("ThirdParty");
+        }
+        if ($action == 'edit') {
+            $out.= $langs->trans("EditCompany");
+        }
+        if ($action == 'create') {
+            $out.= $langs->trans("NewCompany");
+        }
 
         return $out;
     }
@@ -132,18 +138,15 @@ 
 				{
 					$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
+				} 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
+			} else
 			{
 				$this->tpl['tva_intra'] = $s;
 			}
-		}
-		else
+		} else
 		{
 			// Confirm delete third party
 			if ($action == 'delete')
@@ -171,18 +174,15 @@ 
 					{
 						$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
+					} 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
+				} else
 				{
 					$this->tpl['tva_intra'] = $s;
 				}
-			}
-			else
+			} else
 			{
 				$this->tpl['tva_intra'] = '&nbsp;';
 			}
@@ -194,8 +194,7 @@ 
 				$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
+			} else
 			{
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}

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

Braces +56 added lines, -31 removed lines

@@ -66,7 +66,9 @@ 
     	//$ret = $this->getInstanceDao();
 
     	$object = new Societe($this->db);
-    	if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
+    	if (! empty($id) || ! empty($ref)) {
+    	    $object->fetch($id,$ref);
+    	}
     	$this->object = $object;
     }
 
@@ -85,7 +87,9 @@ 
         global $conf, $langs, $user, $mysoc, $canvas;
         global $form, $formadmin, $formcompany;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post($action);
+        if ($action == 'add' || $action == 'update') {
+            $this->assign_post($action);
+        }
 
         if ($_GET["type"]=='f')  		{ $this->object->fournisseur=1; }
         if ($_GET["type"]=='c')  		{ $this->object->client=1; }
@@ -99,7 +103,9 @@ 
         }
 
         $this->tpl['error'] = get_htmloutput_errors($this->object->error,$this->object->errors);
-        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
+        if (is_array($GLOBALS['errors'])) {
+            $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
+        }
 
         if ($action == 'create')
         {
@@ -149,12 +155,16 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                    break;
+                }
             }
             $modCodeClient = new $module($db);
             $this->tpl['auto_customercode'] = $modCodeClient->code_auto;
             // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+            if ($modCodeClient->code_auto) {
+                $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+            }
 
             // TODO create a function
             $this->tpl['select_customertype'] = Form::selectarray('client', array(
@@ -166,7 +176,9 @@ 
 
             // Customer
             $this->tpl['customercode'] = $this->object->code_client;
-            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object,0);
+            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) {
+                $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object,0);
+            }
             $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
             $s=$modCodeClient->getToolTip($langs,$this->object,0);
             $this->tpl['help_customercode'] = $form->textwithpicto('',$s,1);
@@ -185,17 +197,23 @@ 
                 foreach ($dirsociete as $dirroot)
                 {
                     $res=dol_include_once($dirroot.$module.'.php');
-                    if ($res) break;
+                    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();
+            	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);
+            	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);
@@ -216,14 +234,21 @@ 
             $this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
             $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
 
             // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+            if ($this->object->country_id) {
+                $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
+            } else {
+                $this->tpl['select_state'] = $countrynotdefined;
+            }
 
             // Language
-            if (! empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang?$this->object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            if (! empty($conf->global->MAIN_MULTILANGS)) {
+                $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang?$this->object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            }
 
             // VAT
             $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value',$this->tpl['tva_assuj'],1);	// Assujeti par defaut en creation
@@ -244,22 +269,19 @@ 
                     $this->tpl['localtax'].= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
                     $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
                     $this->tpl['localtax'].= '</td></tr>';
-                }
-                elseif($mysoc->localtax1_assuj=="1")
+                } elseif($mysoc->localtax1_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
                     $this->tpl['localtax'].= '</td><tr>';
-                }
-                elseif($mysoc->localtax2_assuj=="1")
+                } elseif($mysoc->localtax2_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
                     $this->tpl['localtax'].= '</td><tr>';
                 }
             }
-        }
-        else
+        } else
         {
             $head = societe_prepare_head($this->object);
 
@@ -273,7 +295,9 @@ 
             $this->tpl['address'] 			= dol_nl2br($this->object->address);
 
             $img=picto_from_langcode($this->object->country_code);
-            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img?$img.' ':'').$this->object->country,$langs->trans("CountryIsInEEC"),1,0);
+            if ($this->object->isInEEC()) {
+                $this->tpl['country'] = $form->textwithpicto(($img?$img.' ':'').$this->object->country,$langs->trans("CountryIsInEEC"),1,0);
+            }
             $this->tpl['country'] = ($img?$img.' ':'').$this->object->country;
 
             $this->tpl['phone'] 	= dol_print_phone($this->object->phone,$this->object->country_code,0,$this->object->id,'AC_TEL');
@@ -304,13 +328,14 @@ 
             $this->tpl['sales_representatives'] = '';
             $listsalesrepresentatives=$this->object->getSalesRepresentatives($user);
             $nbofsalesrepresentative=count($listsalesrepresentatives);
-            if ($nbofsalesrepresentative > 3)   // We print only number
+            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>';
-            }
-            else if ($nbofsalesrepresentative > 0)
+            } else if ($nbofsalesrepresentative > 0)
             {
             	$userstatic=new User($this->db);
             	$i=0;
@@ -321,10 +346,13 @@ 
             		$userstatic->firstname=$val['firstname'];
             		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
             		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+            		if ($i < $nbofsalesrepresentative) {
+            		    $this->tpl['sales_representatives'].= ', ';
+            		}
             	}
+            } else {
+                $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
             }
-            else $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
             if (! empty($conf->adherent->enabled))
@@ -336,8 +364,7 @@ 
                 {
                     $adh->ref=$adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                }
-                else
+                } else
                 {
                     $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
                 }
@@ -355,13 +382,11 @@ 
                     $this->tpl['localtax'].= '<td>'.yn($this->object->localtax1_assuj).'</td>';
                     $this->tpl['localtax'].= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'].= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-                }
-                elseif($mysoc->localtax1_assuj=="1")
+                } elseif($mysoc->localtax1_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
                     $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-                }
-                elseif($mysoc->localtax2_assuj=="1")
+                } elseif($mysoc->localtax2_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';

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

Braces +4 added lines, -1 removed lines

@@ -168,7 +168,10 @@
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>

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

Braces +13 added lines, -4 removed lines

@@ -36,8 +36,14 @@ 
 
 ?>
 
-<?php if ($this->control->tpl['error']) echo $this->control->tpl['error']; ?>
-<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
+<?php if ($this->control->tpl['error']) {
+    echo $this->control->tpl['error'];
+}
+?>
+<?php if ($this->control->tpl['action_delete']) {
+    echo $this->control->tpl['action_delete'];
+}
+?>
 
 <table class="border allwidth">
 
@@ -123,7 +129,10 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['tva_assuj']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 <tr>
 	<td><?php echo $langs->trans("Type"); ?></td>
@@ -192,7 +201,7 @@ 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
-	<?php }	else { ?>
+	<?php } else { ?>
 		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>

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

Braces +4 added lines, -1 removed lines

@@ -170,7 +170,10 @@
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 </table>
 <br>

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

Braces +10 added lines, -5 removed lines

@@ -59,9 +59,15 @@ 
 
         $out='';
 
-        if ($action == 'view')      $out.= $langs->trans("Individual");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view') {
+            $out.= $langs->trans("Individual");
+        }
+        if ($action == 'edit') {
+            $out.= $langs->trans("EditCompany");
+        }
+        if ($action == 'create') {
+            $out.= $langs->trans("NewCompany");
+        }
 
         return $out;
     }
@@ -108,8 +114,7 @@ 
 		if ($action == 'create' || $action == 'edit')
 		{
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else
+		} else
 		{
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)

dolibarr/htdocs/societe/website.php

Braces +174 added lines, -65 removed lines

@@ -41,7 +41,9 @@ 
 
 // Security check
 $id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -52,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.login';
-if (! $sortorder) $sortorder='ASC';
+if (! $sortfield) {
+    $sortfield='t.login';
+}
+if (! $sortorder) {
+    $sortorder='ASC';
+}
 
 // Initialize technical objects
 $object=new Societe($db);
@@ -72,30 +78,38 @@ 
 $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 (! 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]));
+		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]));
+		}
 	}
 }
 
@@ -111,7 +125,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -126,11 +142,13 @@ 
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // 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
+    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();
@@ -166,14 +184,22 @@ 
 llxHeader('', $title);
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($id > 0) $param.='&id='.urlencode($id);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param.='&contextpage='.urlencode($contextpage);
+}
+if ($id > 0) {
+    $param.='&id='.urlencode($id);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param.='&limit='.urlencode($limit);
+}
 foreach($search as $key => $val)
 {
 	$param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+if ($optioncss != '') {
+    $param.='&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -192,17 +218,20 @@ 
 print '<table class="border centpercent">';
 
 // Prefix
-if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+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>';
 }
+}
 
 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>';
+	if ($object->check_codeclient() != 0) {
+			print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -210,8 +239,9 @@ 
 	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>';
+	if ($object->check_codefournisseur() != 0) {
+			print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -246,23 +276,34 @@ 
 	$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 : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX."societe_account as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_account_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($objectwebsiteaccount->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('societeaccount').")";
-else $sql.=" WHERE 1 = 1";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_account_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($objectwebsiteaccount->ismultientitymanaged == 1) {
+    $sql.= " WHERE t.entity IN (".getEntity('societeaccount').")";
+} else {
+    $sql.=" WHERE 1 = 1";
+}
 $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));
+	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);
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -292,9 +333,11 @@ 
 {
 	$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
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -317,12 +360,18 @@ 
 //'presend'=>$langs->trans("SendByMail"),
 //'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->mymodule->delete) {
+    $arrayofmassactions['predelete']=$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend','predelete'))) {
+    $arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -342,7 +391,9 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	foreach($fieldstosearchall as $key => $val) {
+	    $fieldstosearchall[$key]=$langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
@@ -353,8 +404,11 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters, $objectwebsiteaccount);    // Note that $action and $objectwebsiteaccount may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+    $moreforfilter .= $hookmanager->resPrint;
+} else {
+    $moreforfilter = $hookmanager->resPrint;
+}
 
 if (! empty($moreforfilter))
 {
@@ -377,11 +431,19 @@ 
 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>';
-}
+	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';
 // Fields from hook
@@ -402,11 +464,19 @@ 
 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";
-}
+	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
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -422,7 +492,10 @@ 
 $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
 }
 
 
@@ -433,13 +506,18 @@ 
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
+	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;
+		if (isset($obj->$key)) {
+		    $objectwebsiteaccount->$key = $obj->$key;
+		}
 	}
 
 	// Show here line of result
@@ -447,21 +525,36 @@ 
 	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 (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.'"';
+			if ($align) {
+			    print ' class="'.$align.'"';
+			}
 			print '>';
-			if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
-			else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+			if ($key == 'login') {
+			    print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
+			} else {
+			    print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+			}
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 			if (! empty($val['isameasure']))
 			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				if (! $i) {
+				    $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
@@ -474,14 +567,20 @@ 
 	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
+	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;
+	}
+		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']++;
+	if (! $i) {
+	    $totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 
@@ -496,15 +595,20 @@ 
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
+		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>';
+				if ($num < $limit) {
+				    print '<td align="left">'.$langs->trans("Total").'</td>';
+				} else {
+				    print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+			} else {
+			    print '<td></td>';
 			}
-			else print '<td></td>';
 		}
 	}
 	print '</tr>';
@@ -514,7 +618,10 @@ 
 if ($num == 0)
 {
 	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) {
+	    $colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -533,7 +640,9 @@ 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
 	$hidegeneratedfilelistifempty=1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+	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);

dolibarr/htdocs/societe/agenda.php

Braces +34 added lines, -13 removed lines

@@ -37,9 +37,10 @@ 
 if (GETPOST('actioncode','array'))
 {
     $actioncode=GETPOST('actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
-}
-else
+    if (! count($actioncode)) {
+        $actioncode='0';
+    }
+    } else
 {
     $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
@@ -47,7 +48,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -58,8 +61,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='a.datep,a.id';
-if (! $sortorder) $sortorder='DESC,DESC';
+if (! $sortfield) {
+    $sortfield='a.datep,a.id';
+}
+if (! $sortorder) {
+    $sortorder='DESC,DESC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
@@ -71,7 +78,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -83,9 +92,11 @@ 
     }
 
     // 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
+    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
     {
         $actioncode='';
+    }
         $search_agenda_label='';
     }
 }
@@ -110,10 +121,14 @@ 
 	$result = $object->fetch($socid);
 
 	$title=$langs->trans("Agenda");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	    $title=$object->name." - ".$title;
+	}
 	llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (! empty($conf->notification->enabled)) {
+	    $langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
@@ -145,7 +160,9 @@ 
     if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
     {
         //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        if (get_class($objthirdparty) == 'Societe') {
+            $out.='&amp;socid='.$objthirdparty->id;
+        }
         $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
     	//$out.=$langs->trans("AddAnAction").' ';
     	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
@@ -173,8 +190,12 @@ 
     	print '<br>';
 
         $param='&socid='.$socid;
-        if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+        if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+            $param.='&contextpage='.$contextpage;
+        }
+        if ($limit > 0 && $limit != $conf->liste_limit) {
+            $param.='&limit='.$limit;
+        }
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
         //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);

dolibarr/htdocs/societe/admin/societe.php

Braces +86 added lines, -84 removed lines

@@ -34,7 +34,9 @@ 
 $action=GETPOST('action','alpha');
 $value=GETPOST('value','alpha');
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 
@@ -50,8 +52,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -63,8 +64,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -76,12 +76,13 @@ 
 	{
 		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
 		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
+		if (! $res > 0) {
+		    $error++;
+		}
 		if (! $error)
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else
+	    } else
 	    {
 		    setEventMessages($langs->trans("Error"), null, 'errors');
 		}
@@ -91,12 +92,13 @@ 
 	{
 		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
 		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
+		if (! $res > 0) {
+		    $error++;
+		}
 		if (! $error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
@@ -117,8 +119,10 @@ 
 	$sql.= ")";
 
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
-}
+	if (! $resql) {
+	    dol_print_error($db);
+	}
+	}
 
 // Disable a document generator module
 if ($action== 'del')
@@ -127,8 +131,10 @@ 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
-}
+	if (! $resql) {
+	    dol_print_error($db);
+	}
+	}
 
 // Define default generator
 if ($action == 'setdoc')
@@ -159,8 +165,7 @@ 
 	if ($result1 && $result2)
 	{
 		$db->commit();
-	}
-	else
+	} else
 	{
 	    $db->rollback();
 	}
@@ -170,12 +175,13 @@ 
 if ($action=="setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value','int');
 	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -185,12 +191,13 @@ 
 if ($action=="setaddadressinlist") {
 	$val = GETPOST('value','int');
 	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -200,12 +207,13 @@ 
 if ($action=="setaskforshippingmet") {
 	$setaskforshippingmet = GETPOST('value','int');
 	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -215,12 +223,13 @@ 
 if ($action=="setdisableprospectcustomer") {
     $setdisableprospectcustomer = GETPOST('value','int');
     $res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer,'yesno',0,'',$conf->entity);
-    if (! $res > 0) $error++;
+    if (! $res > 0) {
+        $error++;
+    }
     if (! $error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+    } else
     {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -236,8 +245,7 @@ 
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -253,8 +261,7 @@ 
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -270,8 +277,7 @@ 
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -286,8 +292,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -295,12 +300,13 @@ 
 if($action=='setonsearchandlistgooncustomerorsuppliercard'){
        $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
        $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
-       if (! $res > 0) $error++;
+       if (! $res > 0) {
+           $error++;
+       }
        if (! $error)
        {
                setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-       }
-       else
+       } else
        {
                setEventMessages($langs->trans("Error"), null, 'errors');
        }
@@ -357,8 +363,7 @@ 
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
+    			} catch(Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -366,8 +371,12 @@ 
     			$modCodeTiers = new $file;
 
     			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+    			    continue;
+    			}
+    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+    			    continue;
+    			}
 
     			print '<tr class="oddeven">'."\n";
     			print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
@@ -379,15 +388,18 @@ 
     				print '<td align="center">'."\n";
     				print img_picto($langs->trans("Activated"),'switch_on');
     				print "</td>\n";
-    			}
-    			else
+    			} else
     			{
     				$disabled = false;
     				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td align="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				if (! $disabled) {
+    				    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				}
     				print img_picto($langs->trans("Disabled"),'switch_off');
-    				if (! $disabled) print '</a>';
+    				if (! $disabled) {
+    				    print '</a>';
+    				}
     				print '</td>';
     			}
 
@@ -436,8 +448,7 @@ 
 
     		    try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
+    			} catch(Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -455,8 +466,7 @@ 
     				print '<td align="center">';
     				print img_picto($langs->trans("Activated"),'switch_on');
     				print '</td>';
-    			}
-    			else
+    			} else
     			{
     				print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
     				print img_picto($langs->trans("Disabled"),'switch_off');
@@ -498,8 +508,7 @@ 
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -529,8 +538,7 @@ 
 
 			    try {
         			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch(Exception $e)
+    			} catch(Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -539,8 +547,11 @@ 
 
 				$modulequalified=1;
 				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					    $modulequalified=0;
+					} else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					    $modulequalified=0;
+					}
 				}
 
 				if ($modulequalified)
@@ -548,8 +559,11 @@ 
 					print '<tr class="oddeven"><td width="100">';
 					print $module->name;
 					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
-					else print $module->description;
+					if (method_exists($module,'info')) {
+					    print $module->info($langs);
+					} else {
+					    print $module->description;
+					}
 					print '</td>';
 
 					// Activate / Disable
@@ -567,16 +581,14 @@ 
 						//	print img_picto($langs->trans("Enabled"),'on');
 						//}
 						print "</td>";
-					}
-					else
+					} else
 					{
 						if (versioncompare($module->phpmin,versionphparray()) > 0)
 						{
 							print "<td align=\"center\">\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
 							print "</td>";
-						}
-						else
+						} else
 						{
 							print "<td align=\"center\">\n";
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
@@ -603,8 +615,7 @@ 
 					if ($module->type == 'pdf')
 					{
 						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-					}
-					else
+					} else
 					{
 						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
 					}
@@ -672,8 +683,7 @@ 
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"),'switch_on');
 			print '</a></td>';
-		}
-		else
+		} else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"),'switch_off');
@@ -685,8 +695,7 @@ 
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"),'switch_on');
 			print '</a></td>';
-		}
-		else
+		} else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"),'switch_off');
@@ -698,8 +707,7 @@ 
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"),'switch_on');
 			print '</a></td>';
-		}
-		else
+		} else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"),'switch_off');
@@ -738,8 +746,7 @@ 
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
+} else
 {
 	print '<td width="60" align="right">';
 	$arrval=array('0'=>$langs->trans("No"),
@@ -762,8 +769,7 @@ 
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
+} else
 {
 	print '<td width="60" align="right">';
 	$arrval=array('0'=>$langs->trans("No"),
@@ -788,8 +794,7 @@ 
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -805,8 +810,7 @@ 
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -824,8 +828,7 @@ 
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -842,8 +845,7 @@ 
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');