alxarafe / alixar

dolibarr/htdocs/societe/societecontact.php

Braces +25 added lines, -20 removed lines

@@ -39,7 +39,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $id,'');
 
 $object = new Societe($db);
@@ -66,15 +68,13 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
+		} else
 		{
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
@@ -87,8 +87,7 @@ 
 	if ($object->fetch($id))
 	{
 	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -104,8 +103,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -171,17 +169,21 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		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>'.$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>';
 		}
 
@@ -190,7 +192,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>';
 		}
 		print '</table>';
@@ -205,7 +209,9 @@ 
 		foreach($dirtpls as $reldir)
 		{
 			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 
 		// additionnal list with adherents of company
@@ -311,16 +317,16 @@ 
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}
 							print '</td>';
-						}
-						else
+						} else
 						{
 							print '<td align="left" class="nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
-								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
+								if ($objp->statut > 0) {
+								    print " ".img_warning();
+								}
+							} else
 							{
 								print '&nbsp;';
 							}
@@ -334,8 +340,7 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Contrat non trouve
 		print "ErrorRecordNotFound";

dolibarr/htdocs/societe/project.php

Braces +21 added lines, -7 removed lines

@@ -35,7 +35,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');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -48,7 +50,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');
+}
 
 
 
@@ -72,10 +76,14 @@ 
 	$result = $object->fetch($socid);
 
 	$title=$langs->trans("Projects");
-	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, 'project', $langs->trans("ThirdParty"), -1, 'company');
@@ -89,17 +97,21 @@ 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    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>'.$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>';
 	}
 
@@ -108,7 +120,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>';
 	}
 

dolibarr/htdocs/societe/notify/card.php

Braces +57 added lines, -31 removed lines

@@ -38,15 +38,21 @@ 
 $actionid=GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="n.daten";
+}
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -67,7 +73,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))
 {
@@ -103,8 +111,7 @@ 
                     $error++;
                     dol_print_error($db);
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($db);
             }
@@ -112,8 +119,7 @@ 
             if (! $error)
             {
                 $db->commit();
-            }
-            else
+            } else
             {
                 $db->rollback();
             }
@@ -140,7 +146,9 @@ 
 $result=$object->fetch($socid);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Notification");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -163,17 +171,21 @@ 
     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>';
     }
 
@@ -182,7 +194,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>';
     }
 
@@ -262,8 +276,7 @@ 
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else
+    } else
     {
         print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
@@ -292,8 +305,7 @@ 
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -332,8 +344,7 @@ 
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
+                } else
                 {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
@@ -345,8 +356,12 @@ 
             print $label;
             print '</td>';
             print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
+            if ($obj->type == 'email') {
+                print $langs->trans("Email");
+            }
+            if ($obj->type == 'sms') {
+                print $langs->trans("SMS");
+            }
             print '</td>';
             print '<td align="right"><a href="card.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
             print '</tr>';
@@ -429,9 +444,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;
         }
     }
@@ -442,18 +459,23 @@ 
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
 
     $param='&socid='.$object->id;
-    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 '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    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="sortfield" value="'.$sortfield.'">';
@@ -492,8 +514,7 @@ 
 	            $contactstatic->firstname=$obj->firstname;
 	            print $contactstatic->getNomUrl(1);
 	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
-            }
-            else
+            } else
 			{
 				print $obj->email;
             }
@@ -503,8 +524,12 @@ 
             print $label;
             print '</td>';
             print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
+            if ($obj->type == 'email') {
+                print $langs->trans("Email");
+            }
+            if ($obj->type == 'sms') {
+                print $langs->trans("Sms");
+            }
             print '</td>';
             // TODO Add link to object here for other types
             /*print '<td>';
@@ -526,8 +551,9 @@ 
     print '</table>';
 
     print '</form>';
+} else {
+    dol_print_error('','RecordNotFound');
 }
-else dol_print_error('','RecordNotFound');
 
 // End of page
 llxFooter();

dolibarr/htdocs/societe/notify/index.php

Braces +4 added lines, -3 removed lines

@@ -64,7 +64,9 @@ 
 $sql.= " AND a.rowid = n.fk_action";
 $sql.= " AND n.fk_soc = s.rowid";
 $sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
+if ($socid > 0) {
+    $sql.= " AND s.rowid = " . $user->societe_id;
+}
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit, $offset);
@@ -98,8 +100,7 @@ 
 	}
 	print "</table>";
 	$db->free();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/societe/tpl/linesalesrepresentative.tpl.php

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
 		print $userstatic->getNomUrl(-1);
 		print ' ';
 	}
+} else {
+    print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 }
-else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 print '</td></tr>';
 

dolibarr/htdocs/societe/consumption.php

Braces +145 added lines, -64 removed lines

@@ -33,10 +33,14 @@ 
 
 // 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');
 $object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+    $object->fetch($socid);
+}
 
 // Sort & Order fields
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -47,8 +51,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='dateprint';
+if (! $sortorder) {
+    $sortorder='DESC';
+}
+if (! $sortfield) {
+    $sortfield='dateprint';
+}
 
 // Search fields
 $sref=GETPOST("sref");
@@ -57,9 +65,11 @@ 
 $year	= GETPOST('year','int');
 
 // Clean up on purge search criteria ?
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) {
+    // Both test are required to be compatible with all browsers
 {
     $sref='';
+}
     $sprod_fulldescr='';
     $year='';
     $month='';
@@ -81,7 +91,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');
+}
 
 
 
@@ -94,7 +106,9 @@ 
 $productstatic=new Product($db);
 
 $title = $langs->trans("Referers",$object->name);
-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;
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -116,10 +130,12 @@ 
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border" width="100%">';
 
-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 ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
 
@@ -128,41 +144,65 @@ 
 	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>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+	    dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
 	$thirdTypeArray['customer']=$langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
-	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
-}
+	if ($conf->propal->enabled && $user->rights->propal->lire) {
+	    $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+	}
+	if ($conf->commande->enabled && $user->rights->commande->lire) {
+	    $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+	}
+	if ($conf->facture->enabled && $user->rights->facture->lire) {
+	    $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+	}
+	if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+	    $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+	}
+	}
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
+if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) {
+    $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
+}
 
 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>';
+	if ($object->check_codefournisseur() <> 0) {
+	    print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
 	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+	    dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
 	$thirdTypeArray['supplier']=$langs->trans("supplier");
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
-	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
-}
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) {
+	    $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
+	}
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) {
+	    $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
+	}
+	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) {
+	    $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
+	}
+	}
 print '</table>';
 
 print '</div>';
@@ -296,14 +336,26 @@ 
 {
 	$sql = $sql_select;
 	$sql.= ' d.description as description,';
-	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') {
+	    $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'supplier_proposal') {
+	    $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'contract') {
+	    $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element != 'fichinter') {
+	    $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	}
 	$sql.= " s.rowid as socid ";
-	if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
+	if ($type_element != 'fichinter') {
+	    $sql.= ", p.ref as prod_ref, p.label as product_label";
+	}
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
-	if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	if ($type_element != 'fichinter') {
+	    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	}
 	$sql.= $where;
 	if ($month > 0) {
 		if ($year > 0) {
@@ -318,12 +370,18 @@ 
 		$end = dol_time_plus_duree($start,1,'y') - 1;
 		$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
 	}
-	if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	if ($sref) {
+	    $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	}
 	if ($sprod_fulldescr)
 	{
 	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    if (GETPOST('type_element') != 'fichinter') {
+	        $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    }
+	    if (GETPOST('type_element') != 'fichinter') {
+	        $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    }
 	    $sql.=")";
 	}
 	$sql.= $db->order($sortfield,$sortorder);
@@ -360,18 +418,34 @@ 
 if ($sql_select)
 {
 	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+	    dol_print_error($db);
+	}
 
 	$num = $db->num_rows($resql);
 
 	$param="&socid=".$socid."&type_element=".$type_element;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
-	if ($sref) $param.= "&sref=".urlencode($sref);
-	if ($month) $param.= "&month=".$month;
-	if ($year) $param.= "&year=".$year;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+        $param.='&contextpage='.$contextpage;
+    }
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+	    $param.='&limit='.$limit;
+	}
+	if ($sprod_fulldescr) {
+	    $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+	}
+	if ($sref) {
+	    $param.= "&sref=".urlencode($sref);
+	}
+	if ($month) {
+	    $param.= "&month=".$month;
+	}
+	if ($year) {
+	    $param.= "&year=".$year;
+	}
+	if ($optioncss != '') {
+	    $param.='&optioncss='.$optioncss;
+	}
 
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
 
@@ -426,7 +500,9 @@ 
 		$documentstatic->status=$objp->status;
 		$documentstatic->paye=$objp->paid;
 
-		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
+		if (is_object($documentstaticline)) {
+		    $documentstaticline->statut=$objp->status;
+		}
 
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
@@ -439,8 +515,7 @@ 
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else
+		} else
 		{
 			print $documentstatic->getLibStatut(2);
 		}
@@ -474,8 +549,12 @@ 
 
 				$outputlangs = $langs;
 				$newlang='';
-				if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-				if (empty($newlang)) $newlang=$object->default_lang;
+				if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+				    $newlang=GETPOST('lang_id','aZ09');
+				}
+				if (empty($newlang)) {
+				    $newlang=$object->default_lang;
+				}
 				if (! empty($newlang))
 				{
 					$outputlangs = new Translate("",$conf);
@@ -483,8 +562,7 @@ 
 				}
 
 				$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
+			} else
 			{
 				$label = $objp->product_label;
 			}
@@ -498,9 +576,13 @@ 
 			<?php
 			$txt='';
 			print img_object($langs->trans("ShowReduc"),'reduc').' ';
-			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+			if ($objp->description == '(DEPOSIT)') {
+			    $txt=$langs->trans("Deposit");
+			} elseif ($objp->description == '(EXCESS RECEIVED)') {
+			    $txt=$langs->trans("ExcessReceived");
+			} elseif ($objp->description == '(EXCESS PAID)') {
+			    $txt=$langs->trans("ExcessPaid");
+			}
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -519,28 +601,26 @@ 
 					$discount=new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount=new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount=new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 					// Add date of deposit
-					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
+					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+					    echo ' ('.dol_print_date($discount->datec).')';
+					}
+				} else
 				{
 					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else
+		} else
 		{
 			if ($objp->fk_product > 0) {
 
@@ -558,8 +638,11 @@ 
 
 				if (! empty($objp->label) || ! empty($objp->description))
 				{
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					if ($type==1) {
+					    $text = img_object($langs->trans('Service'),'service');
+					} else {
+					    $text = img_object($langs->trans('Product'),'product');
+					}
 
 					if (! empty($objp->label)) {
 						$text.= ' <strong>'.$objp->label.'</strong>';
@@ -621,8 +704,7 @@ 
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
 	}
 	$db->free($resql);
-}
-else if (empty($type_element) || $type_element == -1)
+} else if (empty($type_element) || $type_element == -1)
 {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
@@ -639,8 +721,7 @@ 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
-}
-else {
+} else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
     print '<table class="liste" width="100%">'."\n";

dolibarr/htdocs/societe/document.php

Braces +22 added lines, -9 removed lines

@@ -55,8 +55,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position_name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="position_name";
+}
 
 $object = new Societe($db);
 if ($id > 0 || ! empty($ref))
@@ -86,7 +90,9 @@ 
 $form = new Form($db);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Files");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Files");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -95,7 +101,9 @@ 
 	/*
 	 * Show tabs
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (! empty($conf->notification->enabled)) {
+	    $langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	$form=new Form($db);
@@ -121,17 +129,21 @@ 
 	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>';
 	}
 
@@ -140,7 +152,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>';
 	}
 
@@ -161,8 +175,7 @@ 
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id=' . $object->id;
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	accessforbidden('',0,0);
 }

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

Braces +20 added lines, -6 removed lines

@@ -43,7 +43,10 @@ 
 <?php echo $this->control->tpl['ajax_selectcountry']; ?>
 <?php } ?>
 
-<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?php if ($this->control->tpl['js_checkVatPopup']) {
+    echo $this->control->tpl['js_checkVatPopup'];
+}
+?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc">
 
@@ -154,15 +157,23 @@ 
 <?php
 for ($i=1; $i<=4; $i++) {
 	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+		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>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i==1 || $i==3) {
+		    echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	}
 }
 ?>
@@ -193,7 +204,10 @@ 
 	<td class="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></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/company/tpl/card_view.tpl.php

Braces +39 added lines, -13 removed lines

@@ -36,9 +36,18 @@ 
 
 ?>
 
-<?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['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?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['js_checkVatPopup']) {
+    echo $this->control->tpl['js_checkVatPopup'];
+}
+?>
 
 <table class="border allwidth">
 
@@ -122,20 +131,31 @@ 
 <?php
 for ($i=1; $i<=4; $i++) {
 	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
+		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>';
+			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>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i==1 || $i==3) {
+		    echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	}
 }
 ?>
@@ -147,14 +167,20 @@ 
 	<td><?php echo $this->control->tpl['tva_intra']; ?></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('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>
@@ -247,7 +273,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 } ?>