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

Merge pull request #16473 from frederic34/patch-3

Browse Source 
fix variable name
This commit is contained in:
Laurent Destailleur 2021-02-28 13:25:20 +01:00 committed by GitHub
commit 0bb304ec33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
htdocs/core/lib/project.lib.php
View File

@ -47,14 +47,14 @@ function project_prepare_head(Project $project)
$nbContacts = 0;
// Enable caching of project count Contacts
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$cachekey = 'count_contacts_project_'.$object->id;
$cachekey = 'count_contacts_project_'.$project->id;
$dataretrieved = dol_getcache($cachekey);
if (!is_null($dataretrieved)) {
$nbContacts = $dataretrieved;
} else {
$nbContacts = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external'));
dol_setcache($cachekey, $nbContact, 120); // If setting cache fails, this is not a problem, so we do not test result.
dol_setcache($cachekey, $nbContacts, 120); // If setting cache fails, this is not a problem, so we do not test result.
}
$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$project->id;
$head[$h][1] = $langs->trans("ProjectContact");
@ -69,7 +69,7 @@ function project_prepare_head(Project $project)
$nbTasks = 0;
// Enable caching of project count Tasks
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$cachekey = 'count_tasks_project_'.$object->id;
$cachekey = 'count_tasks_project_'.$project->id;
$dataretrieved = dol_getcache($cachekey);
if (!is_null($dataretrieved)) {
@ -90,7 +90,7 @@ function project_prepare_head(Project $project)
$nbTimeSpent = 0;
// Enable caching of project count Timespent
$cachekey = 'count_timespent_project_'.$object->id;
$cachekey = 'count_timespent_project_'.$project->id;
$dataretrieved = dol_getcache($cachekey);
if (!is_null($dataretrieved)) {
$nbTimeSpent = $dataretrieved;
@ -128,71 +128,72 @@ function project_prepare_head(Project $project)
|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled)) {
$nbElements = 0;
// Enable caching of thirdrparty count Contacts
$cachekey = 'count_elements_project_'.$object->id;
$cachekey = 'count_elements_project_'.$project->id;
$dataretrieved = dol_getcache($cachekey);
if (!is_null($dataretrieved)) {
$nbElements = $dataretrieved;
} else {
if (!empty($conf->propal->enabled)) {
$count += $project->getElementCount('propal', 'propal');
$nbElements += $project->getElementCount('propal', 'propal');
}
if (!empty($conf->commande->enabled)) {
$count += $project->getElementCount('order', 'commande');
$nbElements += $project->getElementCount('order', 'commande');
}
if (!empty($conf->facture->enabled)) {
$count += $project->getElementCount('invoice', 'facture');
$nbElements += $project->getElementCount('invoice', 'facture');
}
if (!empty($conf->facture->enabled)) {
$count += $project->getElementCount('invoice_predefined', 'facture_rec');
$nbElements += $project->getElementCount('invoice_predefined', 'facture_rec');
}
if (!empty($conf->supplier_proposal->enabled)) {
$count += $project->getElementCount('proposal_supplier', 'supplier_proposal');
$nbElements += $project->getElementCount('proposal_supplier', 'supplier_proposal');
}
if (!empty($conf->supplier_order->enabled)) {
$count += $project->getElementCount('order_supplier', 'commande_fournisseur');
$nbElements += $project->getElementCount('order_supplier', 'commande_fournisseur');
}
if (!empty($conf->supplier_invoice->enabled)) {
$count += $project->getElementCount('invoice_supplier', 'facture_fourn');
$nbElements += $project->getElementCount('invoice_supplier', 'facture_fourn');
}
if (!empty($conf->contrat->enabled)) {
$count += $project->getElementCount('contract', 'contrat');
$nbElements += $project->getElementCount('contract', 'contrat');
}
if (!empty($conf->ficheinter->enabled)) {
$count += $project->getElementCount('intervention', 'fichinter');
$nbElements += $project->getElementCount('intervention', 'fichinter');
}
if (!empty($conf->expedition->enabled)) {
$count += $project->getElementCount('shipping', 'expedition');
$nbElements += $project->getElementCount('shipping', 'expedition');
}
if (!empty($conf->mrp->enabled)) {
$count += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');
$nbElements += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');
}
if (!empty($conf->deplacement->enabled)) {
$count += $project->getElementCount('trip', 'deplacement');
$nbElements += $project->getElementCount('trip', 'deplacement');
}
if (!empty($conf->expensereport->enabled)) {
$count += $project->getElementCount('expensereport', 'expensereport');
$nbElements += $project->getElementCount('expensereport', 'expensereport');
}
if (!empty($conf->don->enabled)) {
$count += $project->getElementCount('donation', 'don');
$nbElements += $project->getElementCount('donation', 'don');
}
if (!empty($conf->loan->enabled)) {
$count += $project->getElementCount('loan', 'loan');
$nbElements += $project->getElementCount('loan', 'loan');
}
if (!empty($conf->tax->enabled)) {
$count += $project->getElementCount('chargesociales', 'chargesociales');
$nbElements += $project->getElementCount('chargesociales', 'chargesociales');
}
if (!empty($conf->projet->enabled)) {
$count += $project->getElementCount('project_task', 'projet_task');
$nbElements += $project->getElementCount('project_task', 'projet_task');
}
if (!empty($conf->stock->enabled)) {
$count += $project->getElementCount('stock_mouvement', 'stock');
$nbElements += $project->getElementCount('stock_mouvement', 'stock');
}
if (!empty($conf->salaries->enabled)) {
$count += $project->getElementCount('salaries', 'payment_salary');
$nbElements += $project->getElementCount('salaries', 'payment_salary');
}
if (!empty($conf->banque->enabled)) {
$count += $project->getElementCount('variouspayment', 'payment_various');
$nbElements += $project->getElementCount('variouspayment', 'payment_various');
}
dol_setcache($cachekey, $nbElements, 120); // If setting cache fails, this is not a problem, so we do not test result.
}
$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id;
$head[$h][1] = $langs->trans("ProjectOverview");
@ -244,7 +245,7 @@ function project_prepare_head(Project $project)
$totalAttached = 0;
// Enable caching of thirdrparty count attached files and links
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$cachekey = 'count_attached_project_'.$object->id;
$cachekey = 'count_attached_project_'.$project->id;
$dataretrieved = dol_getcache($cachekey);
if (!is_null($dataretrieved)) {
$totalAttached = $dataretrieved;
@ -270,7 +271,7 @@ function project_prepare_head(Project $project)
$nbComments = 0;
// Enable caching of thirdrparty count attached files and links
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$cachekey = 'count_attached_project_'.$object->id;
$cachekey = 'count_attached_project_'.$project->id;
$dataretrieved = dol_getcache($cachekey);
if (!is_null($dataretrieved)) {
$nbComments = $dataretrieved;