alxarafe / alixar

dolibarr/htdocs/societe/consumption.php

Indentation +335 added lines, -335 removed lines

@@ -100,8 +100,8 @@ 
 
 if (empty($socid))
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $head = societe_prepare_head($object);
@@ -118,50 +118,50 @@ 
 
 if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 {
-	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
 //if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
 
 if ($object->client)
 {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('CustomerCode').'</td><td colspan="3">';
-	print $object->code_client;
-	if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-	print '</td></tr>';
-	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
-	$resql=$db->query($sql);
-	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');
+    print '<tr><td class="titlefield">';
+    print $langs->trans('CustomerCode').'</td><td colspan="3">';
+    print $object->code_client;
+    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+    print '</td></tr>';
+    $sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
+    $resql=$db->query($sql);
+    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->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>';
-	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);
-
-	$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');
+    print '<tr><td class="titlefield">';
+    print $langs->trans('SupplierCode').'</td><td colspan="3">';
+    print $object->code_fournisseur;
+    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+    print '</td></tr>';
+    $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);
+
+    $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');
 }
 print '</table>';
 
@@ -187,66 +187,66 @@ 
 }*/
 if ($type_element == 'fichinter')
 { 	// Customer : show products from invoices
-	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-	$documentstatic=new Fichinter($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
-	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND f.entity = ".$conf->entity;
-	$dateprint = 'f.datec';
-	$doc_number='f.ref';
+    require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+    $documentstatic=new Fichinter($db);
+    $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND f.entity = ".$conf->entity;
+    $dateprint = 'f.datec';
+    $doc_number='f.ref';
 }
 if ($type_element == 'invoice')
 { 	// Customer : show products from invoices
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	$documentstatic=new Facture($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
-	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
-	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
-	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+    $documentstatic=new Facture($db);
+    $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
+    $tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_facture = f.rowid";
+    $where.= " AND f.entity = ".$conf->entity;
+    $dateprint = 'f.datef';
+    $doc_number='f.ref';
+    $thirdTypeSelect='customer';
 }
 if ($type_element == 'propal')
 {
-	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-	$documentstatic=new Propal($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_propal = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$datePrint = 'c.datep';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+    $documentstatic=new Propal($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_propal = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $datePrint = 'c.datep';
+    $doc_number='c.ref';
+    $thirdTypeSelect='customer';
 }
 if ($type_element == 'order')
 {
-	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-	$documentstatic=new Commande($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.date_commande';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+    $documentstatic=new Commande($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_commande = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $dateprint = 'c.date_commande';
+    $doc_number='c.ref';
+    $thirdTypeSelect='customer';
 }
 if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-	$documentstatic=new FactureFournisseur($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
-	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
-	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture_fourn = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
-	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='supplier';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+    $documentstatic=new FactureFournisseur($db);
+    $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
+    $tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_facture_fourn = f.rowid";
+    $where.= " AND f.entity = ".$conf->entity;
+    $dateprint = 'f.datef';
+    $doc_number='f.ref';
+    $thirdTypeSelect='supplier';
 }
 if ($type_element == 'supplier_proposal')
 {
@@ -263,30 +263,30 @@ 
 }
 if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-	$documentstatic=new CommandeFournisseur($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='supplier';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+    $documentstatic=new CommandeFournisseur($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_commande = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $dateprint = 'c.date_valid';
+    $doc_number='c.ref';
+    $thirdTypeSelect='supplier';
 }
 if ($type_element == 'contract')
 { 	// Order
-	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-	$documentstatic=new Contrat($db);
-	$documentstaticline=new ContratLigne($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_contrat = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+    $documentstatic=new Contrat($db);
+    $documentstaticline=new ContratLigne($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_contrat = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $dateprint = 'c.date_valid';
+    $doc_number='c.ref';
+    $thirdTypeSelect='customer';
 }
 
 $parameters=array();
@@ -294,45 +294,45 @@ 
 
 if (!empty($sql_select))
 {
-	$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,';
-	$sql.= " s.rowid as socid ";
-	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 ';
-	$sql.= $where;
-	if ($month > 0) {
-		if ($year > 0) {
-			$start = dol_mktime(0, 0, 0, $month, 1, $year);
-			$end = dol_time_plus_duree($start,1,'m') - 1;
-			$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
-		} else {
-			$sql.= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d',$month)."'";
-		}
-	} else if ($year > 0) {
-		$start = dol_mktime(0, 0, 0, 1, 1, $year);
-		$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 ($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)."%'";
-	    $sql.=")";
-	}
-	$sql.= $db->order($sortfield,$sortorder);
-
-	$resql=$db->query($sql);
-	$totalnboflines = $db->num_rows($resql);
-
-	$sql.= $db->plimit($limit + 1, $offset);
-	//print $sql;
+    $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,';
+    $sql.= " s.rowid as socid ";
+    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 ';
+    $sql.= $where;
+    if ($month > 0) {
+        if ($year > 0) {
+            $start = dol_mktime(0, 0, 0, $month, 1, $year);
+            $end = dol_time_plus_duree($start,1,'m') - 1;
+            $sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+        } else {
+            $sql.= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d',$month)."'";
+        }
+    } else if ($year > 0) {
+        $start = dol_mktime(0, 0, 0, 1, 1, $year);
+        $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 ($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)."%'";
+        $sql.=")";
+    }
+    $sql.= $db->order($sortfield,$sortorder);
+
+    $resql=$db->query($sql);
+    $totalnboflines = $db->num_rows($resql);
+
+    $sql.= $db->plimit($limit + 1, $offset);
+    //print $sql;
 }
 
 $disabled=0;
@@ -359,19 +359,19 @@ 
 
 if ($sql_select)
 {
-	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+    $resql=$db->query($sql);
+    if (!$resql) dol_print_error($db);
 
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
-	$param="&socid=".$socid."&type_element=".$type_element;
+    $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 ($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);
 
@@ -414,167 +414,167 @@ 
     print "</tr>\n";
 
 
-	$i = 0;
-	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
-	{
-		$documentstatic->id=$objp->doc_id;
-		$documentstatic->ref=$objp->doc_number;
-		$documentstatic->type=$objp->doc_type;
-		$documentstatic->fk_statut=$objp->status;
-		$documentstatic->fk_status=$objp->status;
-		$documentstatic->statut=$objp->status;
-		$documentstatic->status=$objp->status;
-		$documentstatic->paye=$objp->paid;
-
-		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
-
-		print '<tr class="oddeven">';
-		print '<td class="nobordernopadding nowrap" width="100">';
-		print $documentstatic->getNomUrl(1);
-		print '</td>';
-		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
-
-		// Status
-		print '<td align="center">';
-		if ($type_element == 'contract')
-		{
-			print $documentstaticline->getLibStatut(2);
-		}
-		else
-		{
-			print $documentstatic->getLibStatut(2);
-		}
-		print '</td>';
-
-		print '<td>';
-
-		// Define text, description and type
-		$text=''; $description=''; $type=0;
-
-		// Code to show product duplicated from commonobject->printObjectLine
-		if ($objp->fk_product > 0)
-		{
-			$product_static = new Product($db);
-
-			$product_static->type=$objp->fk_product_type;
-			$product_static->id=$objp->fk_product;
-			$product_static->ref=$objp->ref;
-			$product_static->entity=$objp->pentity;
-			$text=$product_static->getNomUrl(1);
-		}
-
-		// Product
-		if ($objp->fk_product > 0)
-		{
-			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-			{
-				$prod = new Product($db);
-				$prod->fetch($objp->fk_product);
-
-				$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))
-				{
-					$outputlangs = new Translate("",$conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
-			{
-				$label = $objp->product_label;
-			}
-
-			$text.= ' - '.(! empty($objp->label)?$objp->label:$label);
-			$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
-		}
-
-		if (($objp->info_bits & 2) == 2) { ?>
+    $i = 0;
+    while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
+    {
+        $documentstatic->id=$objp->doc_id;
+        $documentstatic->ref=$objp->doc_number;
+        $documentstatic->type=$objp->doc_type;
+        $documentstatic->fk_statut=$objp->status;
+        $documentstatic->fk_status=$objp->status;
+        $documentstatic->statut=$objp->status;
+        $documentstatic->status=$objp->status;
+        $documentstatic->paye=$objp->paid;
+
+        if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
+
+        print '<tr class="oddeven">';
+        print '<td class="nobordernopadding nowrap" width="100">';
+        print $documentstatic->getNomUrl(1);
+        print '</td>';
+        print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
+
+        // Status
+        print '<td align="center">';
+        if ($type_element == 'contract')
+        {
+            print $documentstaticline->getLibStatut(2);
+        }
+        else
+        {
+            print $documentstatic->getLibStatut(2);
+        }
+        print '</td>';
+
+        print '<td>';
+
+        // Define text, description and type
+        $text=''; $description=''; $type=0;
+
+        // Code to show product duplicated from commonobject->printObjectLine
+        if ($objp->fk_product > 0)
+        {
+            $product_static = new Product($db);
+
+            $product_static->type=$objp->fk_product_type;
+            $product_static->id=$objp->fk_product;
+            $product_static->ref=$objp->ref;
+            $product_static->entity=$objp->pentity;
+            $text=$product_static->getNomUrl(1);
+        }
+
+        // Product
+        if ($objp->fk_product > 0)
+        {
+            // Define output language
+            if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+            {
+                $prod = new Product($db);
+                $prod->fetch($objp->fk_product);
+
+                $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))
+                {
+                    $outputlangs = new Translate("",$conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+
+                $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+            }
+            else
+            {
+                $label = $objp->product_label;
+            }
+
+            $text.= ' - '.(! empty($objp->label)?$objp->label:$label);
+            $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+        }
+
+        if (($objp->info_bits & 2) == 2) { ?>
 			<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
 			<?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");
-			//else $txt=$langs->trans("Discount");
-			print $txt;
-			?>
+            $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");
+            //else $txt=$langs->trans("Discount");
+            print $txt;
+            ?>
 			</a>
 			<?php
-			if ($objp->description)
-			{
-				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
-				{
-					$discount=new DiscountAbsolute($db);
-					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-				}
-				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-				{
-					$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)
-				{
-					$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)
-				{
-					$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
-				{
-					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
-				}
-			}
-		}
-		else
-		{
-			if ($objp->fk_product > 0) {
-
-				echo $form->textwithtooltip($text,$description,3,'','',$i,0,'');
-
-				// Show range
-				echo get_date_range($objp->date_start, $objp->date_end);
-
-				// Add description in form
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
-					print (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-				}
-			} else {
-
-				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 (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
-					} else {
-						echo $text.' '.dol_htmlentitiesbr($objp->description);
-					}
-				}
-
-				// Show range
-				echo get_date_range($objp->date_start,$objp->date_end);
-			}
-		}
-
-		/*
+            if ($objp->description)
+            {
+                if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
+                {
+                    $discount=new DiscountAbsolute($db);
+                    $discount->fetch($objp->fk_remise_except);
+                    echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+                }
+                if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+                {
+                    $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)
+                {
+                    $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)
+                {
+                    $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
+                {
+                    echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
+                }
+            }
+        }
+        else
+        {
+            if ($objp->fk_product > 0) {
+
+                echo $form->textwithtooltip($text,$description,3,'','',$i,0,'');
+
+                // Show range
+                echo get_date_range($objp->date_start, $objp->date_end);
+
+                // Add description in form
+                if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                {
+                    print (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+                }
+            } else {
+
+                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 (! empty($objp->label)) {
+                        $text.= ' <strong>'.$objp->label.'</strong>';
+                        echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
+                    } else {
+                        echo $text.' '.dol_htmlentitiesbr($objp->description);
+                    }
+                }
+
+                // Show range
+                echo get_date_range($objp->date_start,$objp->date_end);
+            }
+        }
+
+        /*
 		$prodreftxt='';
 		if ($objp->prod_id > 0)
 		{
@@ -592,35 +592,35 @@ 
 			$prodreftxt .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 		}
 		*/
-		print '</td>';
+        print '</td>';
 
-		//print '<td align="left">'.$prodreftxt.'</td>';
+        //print '<td align="left">'.$prodreftxt.'</td>';
 
-		print '<td align="right">'.$objp->prod_qty.'</td>';
-		$total_qty+=$objp->prod_qty;
+        print '<td align="right">'.$objp->prod_qty.'</td>';
+        $total_qty+=$objp->prod_qty;
 
-		print '<td align="right">'.price($objp->total_ht).'</td>';
-		$total_ht+=$objp->total_ht;
+        print '<td align="right">'.price($objp->total_ht).'</td>';
+        $total_ht+=$objp->total_ht;
 
-		print '<td align="right">'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'</td>';
+        print '<td align="right">'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'</td>';
 
-		print "</tr>\n";
-		$i++;
-	}
+        print "</tr>\n";
+        $i++;
+    }
 
-	print '<tr class="liste_total">';
-	print '<td>' . $langs->trans('Total') . '</td>';
-	print '<td colspan="3"></td>';
-	print '<td align="right">' . $total_qty . '</td>';
-	print '<td align="right">' . price($total_ht) . '</td>';
-	print '<td align="right">' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '</td>';
-	print "</table>";
-	print '</div>';
+    print '<tr class="liste_total">';
+    print '<td>' . $langs->trans('Total') . '</td>';
+    print '<td colspan="3"></td>';
+    print '<td align="right">' . $total_qty . '</td>';
+    print '<td align="right">' . price($total_ht) . '</td>';
+    print '<td align="right">' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '</td>';
+    print "</table>";
+    print '</div>';
 
-	if ($num > $limit) {
-		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
-	}
-	$db->free($resql);
+    if ($num > $limit) {
+        print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
+    }
+    $db->free($resql);
 }
 else if (empty($type_element) || $type_element == -1)
 {
@@ -636,18 +636,18 @@ 
     print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
+    print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
-	print "</table>";
+    print "</table>";
 }
 else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+    print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 
-	print "</table>";
+    print "</table>";
 }
 
 print "</form>";

Spacing +203 added lines, -203 removed lines

@@ -32,41 +32,41 @@ 
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 $object = new Societe($db);
 if ($socid > 0) $object->fetch($socid);
 
 // Sort & Order fields
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $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");
-$sprod_fulldescr=GETPOST("sprod_fulldescr");
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
+$sref = GETPOST("sref");
+$sprod_fulldescr = GETPOST("sprod_fulldescr");
+$month = GETPOST('month', 'int');
+$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='';
+    $sref = '';
+    $sprod_fulldescr = '';
+    $year = '';
+    $month = '';
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOST('type_element')?GETPOST('type_element'):'';
+$type_element = GETPOST('type_element') ?GETPOST('type_element') : '';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
@@ -79,8 +79,8 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$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');
 
 
@@ -91,12 +91,12 @@ 
 
 $form = new Form($db);
 $formother = new FormOther($db);
-$productstatic=new Product($db);
+$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;
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$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;
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 if (empty($socid))
 {
@@ -109,14 +109,14 @@ 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
 print '<div class="fichecenter">';
 
 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>';
 }
@@ -131,19 +131,19 @@ 
 	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);
+	$resql = $db->query($sql);
 	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');
+	$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->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)
 {
@@ -153,15 +153,15 @@ 
 	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);
+	$resql = $db->query($sql);
 	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');
+	$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');
 }
 print '</table>';
 
@@ -174,7 +174,7 @@ 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?socid='.$socid.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-$sql_select='';
+$sql_select = '';
 /*if ($type_element == 'action')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -188,192 +188,192 @@ 
 if ($type_element == 'fichinter')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-	$documentstatic=new Fichinter($db);
+	$documentstatic = new Fichinter($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
+	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid"; // Must use left join to work also with option that disable usage of lines.
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND f.entity = ".$conf->entity;
+	$where .= " AND f.entity = ".$conf->entity;
 	$dateprint = 'f.datec';
-	$doc_number='f.ref';
+	$doc_number = 'f.ref';
 }
 if ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	$documentstatic=new Facture($db);
+	$documentstatic = new Facture($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
+	$where .= " AND d.fk_facture = f.rowid";
+	$where .= " AND f.entity = ".$conf->entity;
 	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'f.ref';
+	$thirdTypeSelect = 'customer';
 }
 if ($type_element == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-	$documentstatic=new Propal($db);
+	$documentstatic = new Propal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_propal = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_propal = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$datePrint = 'c.datep';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'customer';
 }
 if ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-	$documentstatic=new Commande($db);
+	$documentstatic = new Commande($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_commande = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$dateprint = 'c.date_commande';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'customer';
 }
 if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-	$documentstatic=new FactureFournisseur($db);
+	$documentstatic = new FactureFournisseur($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture_fourn = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
+	$where .= " AND d.fk_facture_fourn = f.rowid";
+	$where .= " AND f.entity = ".$conf->entity;
 	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='supplier';
+	$doc_number = 'f.ref';
+	$thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'supplier_proposal')
 {
     require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $documentstatic=new SupplierProposal($db);
+    $documentstatic = new SupplierProposal($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
     $tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
     $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-    $where.= " AND d.fk_supplier_proposal = c.rowid";
-    $where.= " AND c.entity = ".$conf->entity;
+    $where .= " AND d.fk_supplier_proposal = c.rowid";
+    $where .= " AND c.entity = ".$conf->entity;
     $dateprint = 'c.date_valid';
-    $doc_number='c.ref';
-    $thirdTypeSelect='supplier';
+    $doc_number = 'c.ref';
+    $thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-	$documentstatic=new CommandeFournisseur($db);
+	$documentstatic = new CommandeFournisseur($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_commande = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='supplier';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'contract')
 { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-	$documentstatic=new Contrat($db);
-	$documentstaticline=new ContratLigne($db);
+	$documentstatic = new Contrat($db);
+	$documentstaticline = new ContratLigne($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_contrat = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_contrat = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'customer';
 }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 
 if (!empty($sql_select))
 {
 	$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,';
-	$sql.= " s.rowid as socid ";
-	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 ';
-	$sql.= $where;
+	$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,';
+	$sql .= " s.rowid as socid ";
+	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 ';
+	$sql .= $where;
 	if ($month > 0) {
 		if ($year > 0) {
 			$start = dol_mktime(0, 0, 0, $month, 1, $year);
-			$end = dol_time_plus_duree($start,1,'m') - 1;
-			$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+			$end = dol_time_plus_duree($start, 1, 'm') - 1;
+			$sql .= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
 		} else {
-			$sql.= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d',$month)."'";
+			$sql .= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d', $month)."'";
 		}
 	} else if ($year > 0) {
 		$start = dol_mktime(0, 0, 0, 1, 1, $year);
-		$end = dol_time_plus_duree($start,1,'y') - 1;
-		$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+		$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)."%'";
-	    $sql.=")";
+	    $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)."%'";
+	    $sql .= ")";
 	}
-	$sql.= $db->order($sortfield,$sortorder);
+	$sql .= $db->order($sortfield, $sortorder);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	$totalnboflines = $db->num_rows($resql);
 
-	$sql.= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 	//print $sql;
 }
 
-$disabled=0;
-$showempty=2;
-if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur)
+$disabled = 0;
+$showempty = 2;
+if (empty($elementTypeArray) && !$object->client && !$object->fournisseur)
 {
-    $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
-    $disabled=1;
+    $showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
+    $disabled = 1;
 }
 
 // Define type of elements
 $typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), $showempty, 0, 0, '', 0, 0, $disabled, '', 'maxwidth150onsmartphone');
 $button = '<input type="submit" class="button" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
-$param='';
-$param.="&sref=".urlencode($sref);
-$param.="&month=".urlencode($month);
-$param.="&year=".urlencode($year);
-$param.="&sprod_fulldescr=".urlencode($sprod_fulldescr);
-$param.="&socid=".urlencode($socid);
-$param.="&type_element=".urlencode($type_element);
+$param = '';
+$param .= "&sref=".urlencode($sref);
+$param .= "&month=".urlencode($month);
+$param .= "&year=".urlencode($year);
+$param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+$param .= "&socid=".urlencode($socid);
+$param .= "&type_element=".urlencode($type_element);
 
-$total_qty=0;
+$total_qty = 0;
 
 if ($sql_select)
 {
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	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;
+	$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;
 
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="liste" width="100%">'."\n";
@@ -384,8 +384,8 @@ 
     print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
     print '</td>';
     print '<td class="liste_titre nowrap center">'; // date
-    print $formother->select_month($month?$month:-1, 'month', 1, 0, 'valignmiddle');
-    $formother->select_year($year?$year:-1,'year',1, 20, 1);
+    print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
+    $formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
     print '</td>';
     print '<td class="liste_titre" align="center">';
     print '</td>';
@@ -397,42 +397,42 @@ 
     print '<td class="liste_titre" align="center">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    $searchpicto = $form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';
     print '</tr>';
 
     // Titles with sort buttons
     print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref',$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Date',$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-    print_liste_field_titre('Status',$_SERVER['PHP_SELF'],'fk_statut','',$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('Product',$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('TotalHT',$_SERVER['PHP_SELF'],'total_ht','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('UnitPrice',$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
+    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
     print "</tr>\n";
 
 
 	$i = 0;
 	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
 	{
-		$documentstatic->id=$objp->doc_id;
-		$documentstatic->ref=$objp->doc_number;
-		$documentstatic->type=$objp->doc_type;
-		$documentstatic->fk_statut=$objp->status;
-		$documentstatic->fk_status=$objp->status;
-		$documentstatic->statut=$objp->status;
-		$documentstatic->status=$objp->status;
-		$documentstatic->paye=$objp->paid;
+		$documentstatic->id = $objp->doc_id;
+		$documentstatic->ref = $objp->doc_number;
+		$documentstatic->type = $objp->doc_type;
+		$documentstatic->fk_statut = $objp->status;
+		$documentstatic->fk_status = $objp->status;
+		$documentstatic->statut = $objp->status;
+		$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">';
 		print $documentstatic->getNomUrl(1);
 		print '</td>';
-		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
+		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint), 'day').'</td>';
 
 		// Status
 		print '<td align="center">';
@@ -449,58 +449,58 @@ 
 		print '<td>';
 
 		// Define text, description and type
-		$text=''; $description=''; $type=0;
+		$text = ''; $description = ''; $type = 0;
 
 		// Code to show product duplicated from commonobject->printObjectLine
 		if ($objp->fk_product > 0)
 		{
 			$product_static = new Product($db);
 
-			$product_static->type=$objp->fk_product_type;
-			$product_static->id=$objp->fk_product;
-			$product_static->ref=$objp->ref;
-			$product_static->entity=$objp->pentity;
-			$text=$product_static->getNomUrl(1);
+			$product_static->type = $objp->fk_product_type;
+			$product_static->id = $objp->fk_product;
+			$product_static->ref = $objp->ref;
+			$product_static->entity = $objp->pentity;
+			$text = $product_static->getNomUrl(1);
 		}
 
 		// Product
 		if ($objp->fk_product > 0)
 		{
 			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 			{
 				$prod = new Product($db);
 				$prod->fetch($objp->fk_product);
 
 				$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))
+				$newlang = '';
+				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);
+					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
 
-				$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 			}
 			else
 			{
 				$label = $objp->product_label;
 			}
 
-			$text.= ' - '.(! empty($objp->label)?$objp->label:$label);
-			$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+			$text .= ' - '.(!empty($objp->label) ? $objp->label : $label);
+			$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));
 		}
 
 		if (($objp->info_bits & 2) == 2) { ?>
 			<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
 			<?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");
+			$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");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -510,33 +510,33 @@ 
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
 				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 				}
 				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 				}
 				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+					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).')';
+					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
 				}
 				else
 				{
-					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
+					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		}
@@ -544,33 +544,33 @@ 
 		{
 			if ($objp->fk_product > 0) {
 
-				echo $form->textwithtooltip($text,$description,3,'','',$i,0,'');
+				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
 				// Show range
 				echo get_date_range($objp->date_start, $objp->date_end);
 
 				// Add description in form
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 				{
-					print (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+					print (!empty($objp->description) && $objp->description != $objp->product_label) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 				}
 			} else {
 
-				if (! empty($objp->label) || ! empty($objp->description))
+				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>';
-						echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
+					if (!empty($objp->label)) {
+						$text .= ' <strong>'.$objp->label.'</strong>';
+						echo $form->textwithtooltip($text, dol_htmlentitiesbr($objp->description), 3, '', '', $i, 0, '');
 					} else {
 						echo $text.' '.dol_htmlentitiesbr($objp->description);
 					}
 				}
 
 				// Show range
-				echo get_date_range($objp->date_start,$objp->date_end);
+				echo get_date_range($objp->date_start, $objp->date_end);
 			}
 		}
 
@@ -597,43 +597,43 @@ 
 		//print '<td align="left">'.$prodreftxt.'</td>';
 
 		print '<td align="right">'.$objp->prod_qty.'</td>';
-		$total_qty+=$objp->prod_qty;
+		$total_qty += $objp->prod_qty;
 
 		print '<td align="right">'.price($objp->total_ht).'</td>';
-		$total_ht+=$objp->total_ht;
+		$total_ht += $objp->total_ht;
 
-		print '<td align="right">'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'</td>';
+		print '<td align="right">'.price($objp->total_ht / (empty($objp->prod_qty) ? 1 : $objp->prod_qty)).'</td>';
 
 		print "</tr>\n";
 		$i++;
 	}
 
 	print '<tr class="liste_total">';
-	print '<td>' . $langs->trans('Total') . '</td>';
+	print '<td>'.$langs->trans('Total').'</td>';
 	print '<td colspan="3"></td>';
-	print '<td align="right">' . $total_qty . '</td>';
-	print '<td align="right">' . price($total_ht) . '</td>';
-	print '<td align="right">' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '</td>';
+	print '<td align="right">'.$total_qty.'</td>';
+	print '<td align="right">'.price($total_ht).'</td>';
+	print '<td align="right">'.price($total_ht / (empty($total_qty) ? 1 : $total_qty)).'</td>';
 	print "</table>";
 	print '</div>';
 
 	if ($num > $limit) {
-		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
+		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
 }
 else if (empty($type_element) || $type_element == -1)
 {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
     // Titles with sort buttons
     print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref',$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Date',$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-    print_liste_field_titre('Status',$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('Product',$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
+    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
     print "</tr>\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
@@ -641,7 +641,7 @@ 
 	print "</table>";
 }
 else {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
 

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

Indentation +61 added lines, -61 removed lines

@@ -42,8 +42,8 @@ 
 // Security check
 if ($user->societe_id > 0)
 {
-	unset($action);
-	$socid = $user->societe_id;
+    unset($action);
+    $socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
@@ -61,10 +61,10 @@ 
 $object = new Societe($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+    $result = $object->fetch($id, $ref);
 
-	$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
-	$courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
+    $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
+    $courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -92,24 +92,24 @@ 
 
 if ($object->id)
 {
-	/*
+    /*
 	 * Show tabs
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($object);
+    if (! empty($conf->notification->enabled)) $langs->load("mails");
+    $head = societe_prepare_head($object);
 
-	$form=new Form($db);
+    $form=new Form($db);
 
-	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
+    dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -118,53 +118,53 @@ 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	// Prefix
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
-		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-	}
-
-	if ($object->client)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-	}
-
-	if ($object->fournisseur)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		print '</td></tr>';
-	}
-
-	// Number of files
-	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-
-	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
-
-	print '</table>';
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	$modulepart = 'societe';
-	$permission = $user->rights->societe->creer;
-	$permtoedit = $user->rights->societe->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    print '<table class="border centpercent">';
+
+    // Prefix
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+    if ($object->client)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('CustomerCode').'</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+    }
+
+    if ($object->fournisseur)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('SupplierCode').'</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td></tr>';
+    }
+
+    // Number of files
+    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+    // Total size
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+
+    print '</table>';
+
+    print '</div>';
+
+    dol_fiche_end();
+
+    $modulepart = 'societe';
+    $permission = $user->rights->societe->creer;
+    $permtoedit = $user->rights->societe->creer;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	accessforbidden('',0,0);
+    accessforbidden('',0,0);
 }
 
 // End of page

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);
 }

Spacing +30 added lines, -30 removed lines

@@ -29,7 +29,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . 'main.inc.php';
+require DOL_BASE_PATH.'main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -38,9 +38,9 @@ 
 
 $langs->loadLangs(array("companies", "other"));
 
-$action=GETPOST('action','aZ09');
-$confirm=GETPOST('confirm');
-$id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -52,27 +52,27 @@ 
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $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))
+if ($id > 0 || !empty($ref))
 {
 	$result = $object->fetch($id, $ref);
 
-	$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
-	$courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
+	$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
+	$courrier_dir = $conf->societe->multidir_output[$object->entity]."/courrier/".get_exdir($object->id, 0, 0, 0, $object, 'thirdparty');
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartydocument','globalcard'));
+$hookmanager->initHooks(array('thirdpartydocument', 'globalcard'));
 
 
 
@@ -80,7 +80,7 @@ 
  * Actions
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
@@ -89,35 +89,35 @@ 
 
 $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");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$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");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 if ($object->id)
 {
 	/*
 	 * 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);
+	$form = new Form($db);
 
 	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -125,7 +125,7 @@ 
 	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>';
 	}
@@ -152,7 +152,7 @@ 
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print '</table>';
 
@@ -163,12 +163,12 @@ 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;
 	$permtoedit = $user->rights->societe->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	accessforbidden('',0,0);
+	accessforbidden('', 0, 0);
 }
 
 // End of page

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

Indentation +13 added lines, -13 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -60,7 +60,7 @@ 
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('ThirdPartyName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
     <td><?php echo $langs->trans('Prefix'); ?></td>
     <td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
     <?php } ?>
@@ -103,7 +103,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -140,7 +140,7 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
@@ -152,17 +152,17 @@ 
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		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>';
 	}
 }
 ?>
@@ -179,7 +179,7 @@ 
 	<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
@@ -193,7 +193,7 @@ 
 	<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>

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

Indentation +21 added lines, -21 removed lines

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

Spacing +23 added lines, -23 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -32,7 +32,7 @@ 
 
 $head = societe_prepare_head($soc);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 ?>
 
@@ -47,7 +47,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -76,7 +76,7 @@ 
 </tr>
 <?php } ?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
@@ -120,9 +120,9 @@ 
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['profid'.$i];
 		if ($this->control->tpl['profid'.$i]) {
@@ -130,12 +130,12 @@ 
 			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,7 +147,7 @@ 
 	<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>
@@ -171,7 +171,7 @@ 
 	<td><?php echo $this->control->tpl['effectif']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['default_lang']; ?></td>
@@ -225,10 +225,10 @@ 
 		</tr>
 	</table>
 	</td>
-	<td colspan="3"><?php echo $this->control->tpl['sales_representatives'];	?></td>
+	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (! empty($conf->adherent->enabled)) { ?>
+<?php if (!empty($conf->adherent->enabled)) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
@@ -247,7 +247,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 } ?>
@@ -262,12 +262,12 @@ 
 /*
  * Documents generes
  */
-$filedir=$conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
-$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed=$user->rights->societe->lire;
-$delallowed=$user->rights->societe->creer;
+$filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
+$urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
+$genallowed = $user->rights->societe->lire;
+$delallowed = $user->rights->societe->creer;
 
-print $formfile->showdocuments('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
+print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
 ?>
 
 </td>
@@ -279,13 +279,13 @@ 
 
 <?php
 // Subsidiaries list
-$result=show_subsidiaries($conf,$langs,$db,$soc);
+$result = show_subsidiaries($conf, $langs, $db, $soc);
 
 // Contacts list
-$result=show_contacts($conf,$langs,$db,$soc);
+$result = show_contacts($conf, $langs, $db, $soc);
 
 // Projects list
-$result=show_projects($conf,$langs,$db,$soc);
+$result = show_projects($conf, $langs, $db, $soc);
 ?>
 
 <!-- END PHP TEMPLATE -->
\ No newline at end of file

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

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

Indentation +14 added lines, -14 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -53,7 +53,7 @@ 
 	<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans("Prefix"); ?></td>
 	<td colspan="3">
@@ -118,7 +118,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -155,24 +155,24 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		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>';
 	}
 }
 ?>
@@ -201,14 +201,14 @@ 
 	<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
 </tr>
 <?php } ?>
 
-<?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>

Braces +20 added lines, -6 removed lines

@@ -35,7 +35,10 @@ 
 <?php echo $this->control->tpl['error']; ?>
 
 <?php echo $this->control->tpl['ajax_selectcountry']; ?>
-<?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"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@@ -164,15 +167,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>';
+		}
 	}
 }
 ?>
@@ -208,7 +219,10 @@ 
 </tr>
 <?php } ?>
 
-<?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/company/actions_card_company.class.php

Indentation +151 added lines, -151 removed lines

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

Spacing +44 added lines, -44 removed lines

@@ -40,11 +40,11 @@ 
 	 */
 	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db				= $db;
-        $this->dirmodule		= $dirmodule;
-        $this->targetmodule		= $targetmodule;
-        $this->canvas			= $canvas;
-        $this->card				= $card;
+        $this->db = $db;
+        $this->dirmodule = $dirmodule;
+        $this->targetmodule = $targetmodule;
+        $this->canvas = $canvas;
+        $this->card = $card;
 	}
 
     /**
@@ -57,11 +57,11 @@ 
     {
         global $langs;
 
-        $out='';
+        $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;
     }
@@ -76,19 +76,19 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-	function assign_values(&$action, $id=0, $ref='')
+	function assign_values(&$action, $id = 0, $ref = '')
 	{
         // phpcs:enable
 		global $conf, $langs, $user, $mysoc;
 		global $form, $formadmin, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+		$ret = $this->getObject($id, $ref);
 
 		parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-        $this->tpl['profid1'] 	= $this->object->idprof1;
+        $this->tpl['profid1'] = $this->object->idprof1;
 		$this->tpl['profid2'] 	= $this->object->idprof2;
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
@@ -96,46 +96,46 @@ 
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
 		{
 			$js = "\n";
-	        $js.= '<script language="JavaScript" type="text/javascript">';
-	        $js.= "function CheckVAT(a) {\n";
-	        $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js.= "}\n";
-	        $js.= '</script>';
-	        $js.= "\n";
+	        $js .= '<script language="JavaScript" type="text/javascript">';
+	        $js .= "function CheckVAT(a) {\n";
+	        $js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+	        $js .= "}\n";
+	        $js .= '</script>';
+	        $js .= "\n";
 			$this->tpl['js_checkVatPopup'] = $js;
 		}
 
 		if ($action == 'create' || $action == 'edit')
 		{
-			for ($i=1; $i<=4; $i++)
+			for ($i = 1; $i <= 4; $i++)
 			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
+				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
+				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i, 'idprof'.$i, $this->tpl['profid'.$i], $this->object->country_code);
 			}
 
 			// Type
-			$this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
+			$this->tpl['select_companytype'] = $form->selectarray("typent_id", $formcompany->typent_array(0), $this->object->typent_id);
 
 			// Juridical Status
-			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
+			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code, $this->object->country_code);
 
 			// Workforce
-			$this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
+			$this->tpl['select_workforce'] = $form->selectarray("effectif_id", $formcompany->effectif_array(0), $this->object->effectif_id);
 
 			// VAT intra
-			$s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+			$s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
 			if (empty($conf->global->MAIN_DISABLEVATCHECK))
 			{
-				$s.=' ';
+				$s .= ' ';
 
 				if ($conf->use_javascript_ajax)
 				{
-					$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-					$this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
 				}
 				else
 				{
-					$this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
 			}
 			else
@@ -148,33 +148,33 @@ 
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "1,action-delete");
 			}
 
-			for ($i=1; $i<=4; $i++)
+			for ($i = 1; $i <= 4; $i++)
 			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
-				$this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
+				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
+				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i, $this->object);
+				$this->tpl['urlprofid'.$i] = $this->object->id_prof_url($i, $this->object);
 			}
 
 			// TVA intra
 			if ($this->object->tva_intra)
 			{
-				$s=$this->object->tva_intra;
-				$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+				$s = $this->object->tva_intra;
+				$s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
 				if (empty($conf->global->MAIN_DISABLEVATCHECK))
 				{
-					$s.=' &nbsp; ';
+					$s .= ' &nbsp; ';
 
 					if ($conf->use_javascript_ajax)
 					{
-						$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-						$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
 					}
 					else
 					{
-						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
 				}
 				else
@@ -192,8 +192,8 @@ 
 			{
 				$socm = new Societe($this->db);
 				$socm->fetch($this->object->parent);
-				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
-				$this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
+				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
+				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
 			}
 			else
 			{
@@ -215,8 +215,8 @@ 
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+	function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
 	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
 	}
 }

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

Indentation +70 added lines, -70 removed lines

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

Spacing +130 added lines, -130 removed lines

@@ -45,7 +45,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -61,12 +61,12 @@ 
      *  @param		ref		$ref		Object ref
      *  @return		object				Object loaded
      */
-    protected function getObject($id,$ref='')
+    protected function getObject($id, $ref = '')
     {
     	//$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;
     }
 
@@ -79,7 +79,7 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
      */
-    function assign_values(&$action, $id=0, $ref='')
+    function assign_values(&$action, $id = 0, $ref = '')
     {
         // phpcs:enable
         global $conf, $langs, $user, $mysoc, $canvas;
@@ -87,19 +87,19 @@ 
 
         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; }
-        if ($_GET["type"]=='p')  		{ $this->object->client=2; }
-        if ($_GET["type"]=='cp') 		{ $this->object->client=3; }
-        if ($_REQUEST["private"]==1) 	{ $this->object->particulier=1;	}
+        if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
+        if ($_GET["type"] == 'c') { $this->object->client = 1; }
+        if ($_GET["type"] == 'p') { $this->object->client = 2; }
+        if ($_GET["type"] == 'cp') { $this->object->client = 3; }
+        if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
 
-        foreach($this->object as $key => $value)
+        foreach ($this->object as $key => $value)
         {
             $this->tpl[$key] = $value;
         }
 
-        $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');
+        $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 ($action == 'create')
         {
@@ -140,15 +140,15 @@ 
 			}
 
             // Load object modCodeClient
-            $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
             if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             {
-                $module = substr($module, 0, dol_strlen($module)-4);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeClient = new $module($db);
@@ -166,25 +166,25 @@ 
 
             // 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);
+            $s = $modCodeClient->getToolTip($langs, $this->object, 0);
+            $this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
 
-            if (! empty($conf->fournisseur->enabled))
+            if (!empty($conf->fournisseur->enabled))
             {
             	$this->tpl['supplier_enabled'] = 1;
 
             	// Load object modCodeFournisseur
-            	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+            	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
             	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             	{
-            		$module = substr($module, 0, dol_strlen($module)-4);
+            		$module = substr($module, 0, dol_strlen($module) - 4);
             	}
-                $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+                $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
                 foreach ($dirsociete as $dirroot)
                 {
-                    $res=dol_include_once($dirroot.$module.'.php');
+                    $res = dol_include_once($dirroot.$module.'.php');
                     if ($res) break;
                 }
             	$modCodeFournisseur = new $module;
@@ -193,69 +193,69 @@ 
             	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['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);
+            	$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
+            	$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
 
             	$this->object->LoadSupplierCateg();
             	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
             }
 
             // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
             // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town,'town',array('zipcode','selectcountry_id','state_id'));
+            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
             // Country
             $this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
             $this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
+            $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);
+            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
+            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
 
             // Select users
             $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 
             // Local Tax
             // TODO mettre dans une classe propre au pays
-            if($mysoc->country_code=='ES')
+            if ($mysoc->country_code == 'ES')
             {
                 $this->tpl['localtax'] = '';
 
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
-                    $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>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+                    $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>';
+                    $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>';
+                    $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>';
                 }
             }
         }
@@ -263,78 +263,78 @@ 
         {
             $head = societe_prepare_head($this->object);
 
-            $this->tpl['showhead']=dol_get_fiche_head($head, 'card', '', 0, 'company');
-            $this->tpl['showend']=dol_get_fiche_end();
+            $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
+            $this->tpl['showend'] = dol_get_fiche_end();
 
-            $this->tpl['showrefnav'] 		= $form->showrefnav($this->object,'socid','',($user->societe_id?0:1),'rowid','nom');
+            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
             $this->tpl['checkcustomercode'] = $this->object->check_codeclient();
             $this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
-            $this->tpl['address'] 			= dol_nl2br($this->object->address);
+            $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);
-            $this->tpl['country'] = ($img?$img.' ':'').$this->object->country;
+            $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);
+            $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');
-            $this->tpl['fax'] 		= dol_print_phone($this->object->fax,$this->object->country_code,0,$this->object->id,'AC_FAX');
-            $this->tpl['email'] 	= dol_print_email($this->object->email,0,$this->object->id,'AC_EMAIL');
+            $this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+            $this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+            $this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
             $this->tpl['url'] 		= dol_print_url($this->object->url);
 
-            $this->tpl['tva_assuj']		= yn($this->object->tva_assuj);
+            $this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
 
             // Third party type
             $arr = $formcompany->typent_array(1);
             $this->tpl['typent'] = $arr[$this->object->typent_code];
 
-            if (! empty($conf->global->MAIN_MULTILANGS))
+            if (!empty($conf->global->MAIN_MULTILANGS))
             {
                 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
                 //$s=picto_from_langcode($this->default_lang);
                 //print ($s?$s.' ':'');
                 $langs->load("languages");
-                $this->tpl['default_lang'] = ($this->default_lang?$langs->trans('Language_'.$this->object->default_lang):'');
+                $this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
             }
 
-            $this->tpl['image_edit']	= img_edit();
+            $this->tpl['image_edit'] = img_edit();
 
-            $this->tpl['display_rib']	= $this->object->display_rib();
+            $this->tpl['display_rib'] = $this->object->display_rib();
 
             // Sales representatives
             $this->tpl['sales_representatives'] = '';
-            $listsalesrepresentatives=$this->object->getSalesRepresentatives($user);
-            $nbofsalesrepresentative=count($listsalesrepresentatives);
+            $listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
+            $nbofsalesrepresentative = count($listsalesrepresentatives);
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
-            	$this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
-            	$this->tpl['sales_representatives'].= $nbofsalesrepresentative;
-            	$this->tpl['sales_representatives'].= '</a>';
+            	$this->tpl['sales_representatives'] .= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
+            	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
+            	$this->tpl['sales_representatives'] .= '</a>';
             }
             else if ($nbofsalesrepresentative > 0)
             {
-            	$userstatic=new User($this->db);
-            	$i=0;
-            	foreach($listsalesrepresentatives as $val)
+            	$userstatic = new User($this->db);
+            	$i = 0;
+            	foreach ($listsalesrepresentatives as $val)
             	{
-            		$userstatic->id=$val['id'];
-            		$userstatic->lastname=$val['name'];
-            		$userstatic->firstname=$val['firstname'];
-            		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
+            		$userstatic->id = $val['id'];
+            		$userstatic->lastname = $val['name'];
+            		$userstatic->firstname = $val['firstname'];
+            		$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
             		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+            		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))
+            if (!empty($conf->adherent->enabled))
             {
                 $langs->load("members");
-                $adh=new Adherent($this->db);
-                $result=$adh->fetch('','',$this->object->id);
+                $adh = new Adherent($this->db);
+                $result = $adh->fetch('', '', $this->object->id);
                 if ($result > 0)
                 {
-                    $adh->ref=$adh->getFullName($langs);
+                    $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
                 }
                 else
@@ -345,26 +345,26 @@ 
 
             // Local Tax
             // TODO mettre dans une classe propre au pays
-            if($mysoc->country_code=='ES')
+            if ($mysoc->country_code == 'ES')
             {
                 $this->tpl['localtax'] = '';
 
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $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>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+                    $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>';
+                    $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>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
                 }
             }
         }
@@ -382,47 +382,47 @@ 
         // phpcs:enable
         global $langs, $mysoc;
 
-        $this->object->id					=	$_POST["socid"];
-        $this->object->name					=	$_POST["nom"];
-        $this->object->prefix_comm			=	$_POST["prefix_comm"];
-        $this->object->client				=	$_POST["client"];
-        $this->object->code_client			=	$_POST["code_client"];
-        $this->object->fournisseur			=	$_POST["fournisseur"];
-        $this->object->code_fournisseur		=	$_POST["code_fournisseur"];
-        $this->object->address				=	$_POST["adresse"];
-        $this->object->zip					=	$_POST["zipcode"];
-        $this->object->town					=	$_POST["town"];
-        $this->object->country_id			=	$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id;
-        $this->object->state_id		        =	$_POST["state_id"];
-        $this->object->phone				=	$_POST["tel"];
-        $this->object->fax					=	$_POST["fax"];
-        $this->object->email				=	$_POST["email"];
-        $this->object->url					=	$_POST["url"];
-        $this->object->capital				=	$_POST["capital"];
-        $this->object->idprof1				=	$_POST["idprof1"];
-        $this->object->idprof2				=	$_POST["idprof2"];
-        $this->object->idprof3				=	$_POST["idprof3"];
-        $this->object->idprof4				=	$_POST["idprof4"];
-        $this->object->typent_id			=	$_POST["typent_id"];
-        $this->object->effectif_id			=	$_POST["effectif_id"];
-        $this->object->barcode				=	$_POST["barcode"];
-        $this->object->forme_juridique_code	=	$_POST["forme_juridique_code"];
-        $this->object->default_lang			=	$_POST["default_lang"];
-        $this->object->commercial_id		=	$_POST["commercial_id"];
-
-        $this->object->tva_assuj 			= 	$_POST["assujtva_value"]?$_POST["assujtva_value"]:1;
-        $this->object->tva_intra			=	$_POST["tva_intra"];
+        $this->object->id = $_POST["socid"];
+        $this->object->name = $_POST["nom"];
+        $this->object->prefix_comm			= $_POST["prefix_comm"];
+        $this->object->client = $_POST["client"];
+        $this->object->code_client			= $_POST["code_client"];
+        $this->object->fournisseur			= $_POST["fournisseur"];
+        $this->object->code_fournisseur = $_POST["code_fournisseur"];
+        $this->object->address = $_POST["adresse"];
+        $this->object->zip = $_POST["zipcode"];
+        $this->object->town					= $_POST["town"];
+        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+        $this->object->state_id = $_POST["state_id"];
+        $this->object->phone				= $_POST["tel"];
+        $this->object->fax					= $_POST["fax"];
+        $this->object->email				= $_POST["email"];
+        $this->object->url					= $_POST["url"];
+        $this->object->capital				= $_POST["capital"];
+        $this->object->idprof1				= $_POST["idprof1"];
+        $this->object->idprof2				= $_POST["idprof2"];
+        $this->object->idprof3				= $_POST["idprof3"];
+        $this->object->idprof4				= $_POST["idprof4"];
+        $this->object->typent_id = $_POST["typent_id"];
+        $this->object->effectif_id = $_POST["effectif_id"];
+        $this->object->barcode				= $_POST["barcode"];
+        $this->object->forme_juridique_code = $_POST["forme_juridique_code"];
+        $this->object->default_lang			= $_POST["default_lang"];
+        $this->object->commercial_id		= $_POST["commercial_id"];
+
+        $this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
+        $this->object->tva_intra = $_POST["tva_intra"];
 
         //Local Taxes
-        $this->object->localtax1_assuj		= 	$_POST["localtax1assuj_value"];
-        $this->object->localtax2_assuj		= 	$_POST["localtax2assuj_value"];
+        $this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
+        $this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
         // We set country_id, and country_code label of the chosen country
         if ($this->object->country_id)
         {
-            $tmparray=getCountry($this->object->country_id,'all',$this->db,$langs,0);
-            $this->object->country_code	=	$tmparray['code'];
-            $this->object->country_label=	$tmparray['label'];
+            $tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
+            $this->object->country_code	= $tmparray['code'];
+            $this->object->country_label = $tmparray['label'];
         }
     }
 }

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

Indentation +2 added lines, -2 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -58,7 +58,7 @@ 
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('LastName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
 	<?php } ?>
@@ -113,7 +113,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -150,13 +150,13 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
@@ -168,7 +168,7 @@ 
 	<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>

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

Indentation +2 added lines, -2 removed lines

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

Spacing +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -32,7 +32,7 @@ 
 
 $head = societe_prepare_head($object);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 ?>
 
@@ -46,7 +46,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -75,7 +75,7 @@ 
 </tr>
 <?php } ?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
@@ -123,14 +123,14 @@ 
 	<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>
 	<td colspan="3"><?php echo $this->control->tpl['typent']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['default_lang']; ?></td>
@@ -170,10 +170,10 @@ 
 		</tr>
 	</table>
 	</td>
-	<td colspan="3"><?php echo $this->control->tpl['sales_representatives'];	?></td>
+	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (! empty($conf->adherent->enabled)) { ?>
+<?php if (!empty($conf->adherent->enabled)) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
@@ -192,7 +192,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 } ?>
@@ -206,12 +206,12 @@ 
 /*
  * Documents generes
  */
-$filedir=$conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
-$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed=$user->rights->societe->lire;
-$delallowed=$user->rights->societe->creer;
+$filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
+$urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
+$genallowed = $user->rights->societe->lire;
+$delallowed = $user->rights->societe->creer;
 
-print $formfile->showdocuments('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
+print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
 ?>
 
 </td>
@@ -223,13 +223,13 @@ 
 
 <?php
 // Subsidiaries list
-$result=show_subsidiaries($conf,$langs,$db,$object);
+$result = show_subsidiaries($conf, $langs, $db, $object);
 
 // Contacts list
-$result=show_contacts($conf,$langs,$db,$object);
+$result = show_contacts($conf, $langs, $db, $object);
 
 // Projects list
-$result=show_projects($conf,$langs,$db,$object);
+$result = show_projects($conf, $langs, $db, $object);
 ?>
 
 <!-- END PHP TEMPLATE -->
\ No newline at end of file

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