lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce the $companystatic calls

Browse Source
This commit is contained in:
dolibarr95 2019-10-22 15:51:30 +02:00 committed by GitHub
parent 22a14e7bf7
commit d0a599a1d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/commande/list.php
View File

@ -236,7 +236,6 @@ $now=dol_now();
$form = new Form($db); $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
$companystatic = new Societe($db);
$formcompany=new FormCompany($db); $formcompany=new FormCompany($db);
$projectstatic=new Project($db); $projectstatic=new Project($db);
@ -772,6 +771,9 @@ if ($resql)
$generic_commande = new Commande($db); $generic_commande = new Commande($db);
$generic_product = new Product($db); $generic_product = new Product($db);
$companystatic = array();
$getNomUrl = array();
$i=0; $i=0;
$totalarray=array(); $totalarray=array();
while ($i < min($num, $limit)) while ($i < min($num, $limit))
@ -784,11 +786,15 @@ if ($resql)
$text_warning=''; $text_warning='';
$nbprod=0; $nbprod=0;
$companystatic->id=$obj->socid; if (!isset($companystatic[$obj->socid])) {
$companystatic->code_client = $obj->code_client; $companystatic[$obj->socid] = new Societe($db);
$companystatic->name=$obj->name; $companystatic[$obj->socid]->id = $obj->socid;
$companystatic->client=$obj->client; $companystatic[$obj->socid]->code_client = $obj->code_client;
$companystatic->email=$obj->email; $companystatic[$obj->socid]->name = $obj->name;
$companystatic[$obj->socid]->client = $obj->client;
$companystatic[$obj->socid]->email = $obj->email;
$getNomUrl[$obj->socid] = $companystatic[$obj->socid]->getNomUrl(1, 'customer');
}
$generic_commande->id=$obj->rowid; $generic_commande->id=$obj->rowid;
$generic_commande->ref=$obj->ref; $generic_commande->ref=$obj->ref;
@ -973,7 +979,7 @@ if ($resql)
if (! empty($arrayfields['s.nom']['checked'])) if (! empty($arrayfields['s.nom']['checked']))
{ {
print '<td class="tdoverflowmax200">'; print '<td class="tdoverflowmax200">';
print $companystatic->getNomUrl(1, 'customer'); print $getNomUrl[$obj->socid];
// If module invoices enabled and user with invoice creation permissions // If module invoices enabled and user with invoice creation permissions
if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
@ -982,8 +988,8 @@ if ($resql)
{ {
if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0))
{ {
print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic->id.'">'; print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic[$obj->socid]->id.'">';
print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>'; print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic[$obj->socid]->name, 'object_bill', 'hideonsmartphone').'</a>';
} }
} }
} }