Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur
2024-04-22 15:51:43 +02:00
parent dd9993401c
commit 699b3e421c
13 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/product.lib.php
View File

@@ -425,7 +425,7 @@ function product_lot_admin_prepare_head()
*/
function show_stats_for_company($product, $socid)
{
global $conf, $langs, $user, $db, $hookmanager;
global $langs, $user, $db, $hookmanager;
$form = new Form($db);

11
htdocs/product/stats/bom.php
View File

@@ -47,7 +47,6 @@ if ($user->socid) {
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('productstatsbom'));
$mesg = '';
$option = '';
// Load variable for pagination
@@ -68,6 +67,8 @@ if (!$sortfield) {
$sortfield = "b.date_valid";
}
$socid = 0;
$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
@@ -115,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield" width="100%">';
print '<table class="border tableforfield centpercent">';
$nboflines = show_stats_for_company($product, $socid);
@@ -182,6 +183,9 @@ if ($id > 0 || !empty($ref)) {
$bomtmp->fk_product = $objp->fk_product;
$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache) ? $product_cache[$objp->fk_product]->getNomUrl(1) : '');
if (empty($bom_data_result[$objp->rowid]['qty_toproduce'])) {
$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
}
$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -246,6 +250,9 @@ if ($id > 0 || !empty($ref)) {
$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache) ? $product_cache[$objp->fk_product]->getNomUrl(1) : '');
$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
if (empty($bom_data_result[$objp->rowid]['qty_toconsume'])) {
$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
}
$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
$bom_data_result[$objp->rowid]['status'] = $bomtmp->LibStatut($objp->status, 5);

8
htdocs/product/stats/commande.php
View File

@@ -233,7 +233,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print $langs->trans('Status');
$formorder->selectOrderStatus($search_status, 1, 'search_status');
@@ -290,10 +290,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
// delivery planned date

8
htdocs/product/stats/commande_fournisseur.php
View File

@@ -233,7 +233,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print $langs->trans('Status');
$formorder->selectSupplierOrderStatus($search_status, 1, 'search_status');
@@ -290,10 +290,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
// delivery planned date

6
htdocs/product/stats/contrat.php
View File

@@ -63,6 +63,8 @@ if (!$sortfield) {
$sortfield = "c.date_contrat";
}
$socid = 0;
$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
@@ -175,12 +177,14 @@ if ($id > 0 || !empty($ref)) {
if ($limit > 0 && $limit != $conf->liste_limit) {
$option .= '&limit='.((int) $limit);
}
/*
if (!empty($search_month)) {
$option .= '&search_month='.urlencode($search_month);
}
if (!empty($search_year)) {
$option .= '&search_year='.urlencode((string) ($search_year));
}
*/
print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -241,6 +245,8 @@ if ($id > 0 || !empty($ref)) {
print "</tr>\n";
$i++;
}
} else {
print '<tr><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
}
print '</table>';

8
htdocs/product/stats/expedition.php
View File

@@ -213,7 +213,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -269,10 +269,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
print '<td></td>';

15
htdocs/product/stats/facture.php
View File

@@ -75,6 +75,8 @@ if (!$sortfield) {
$sortfield = "f.datef";
}
$option = '';
$search_date_startday = GETPOSTINT('search_date_startday');
if (!empty($search_date_startday)) {
$option .= '&search_date_startday='.$search_date_startday;
@@ -239,6 +241,7 @@ if ($id > 0 || !empty($ref)) {
$sql .= " AND f.fk_soc = ".((int) $socid);
}
// Add where from extra fields
$extrafieldsobjectkey = 'facture';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
$parameters = array();
@@ -274,12 +277,6 @@ if ($id > 0 || !empty($ref)) {
if ($limit > 0 && $limit != $conf->liste_limit) {
$option .= '&limit='.((int) $limit);
}
if (!empty($search_month)) {
$option .= '&search_month='.urlencode($search_month);
}
if (!empty($search_year)) {
$option .= '&search_year='.urlencode((string) ($search_year));
}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -373,10 +370,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
print '<td class="center">'.$total_qty.'</td>';

10
htdocs/product/stats/facture_fournisseur.php
View File

@@ -49,6 +49,8 @@ if (!empty($user->socid)) {
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('productstatssupplierinvoice'));
$option = '';
// Load variable for pagination
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -215,7 +217,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -271,10 +273,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
print '<td class="center">'.$total_qty.'</td>';

10
htdocs/product/stats/facturerec.php
View File

@@ -156,7 +156,7 @@ if ($id > 0 || !empty($ref)) {
print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
} elseif ($user->hasRight('facture', 'lire')) {
$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
$sql .= "f.titre as title, f.datec, f.rowid as facid, f.suspended as suspended,";
$sql .= "f.rowid as facid, 0 as type, f.titre as title, f.datec, f.suspended as suspended,";
$sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
if (!$user->hasRight('societe', 'client', 'voir')) {
$sql .= ", sc.fk_soc, sc.fk_user ";
@@ -233,7 +233,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -287,10 +287,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
print '<td class="center">'.$total_qty.'</td>';

6
htdocs/product/stats/mo.php
View File

@@ -73,6 +73,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
$search_year = '';
}
$socid = 0;
$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
@@ -124,7 +126,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield" width="100%">';
print '<table class="border tableforfield centpercent">';
$nboflines = show_stats_for_company($product, $socid);
@@ -211,7 +213,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';

8
htdocs/product/stats/propal.php
View File

@@ -217,7 +217,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -266,10 +266,10 @@ if ($id > 0 || !empty($ref)) {
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="2"></td>';
print '<td class="center">'.$total_qty.'</td>';

8
htdocs/product/stats/reception.php
View File

@@ -212,7 +212,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -268,10 +268,10 @@ if ($id > 0 || !empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="3"></td>';
print '<td></td>';

8
htdocs/product/stats/supplier_proposal.php
View File

@@ -216,7 +216,7 @@ if ($id > 0 || !empty($ref)) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print '<div class="divsearchfield">';
print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
print '<div style="vertical-align: middle; display: inline-block">';
print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
@@ -264,10 +264,10 @@ if ($id > 0 || !empty($ref)) {
}
print '<tr class="liste_total">';
if ($num < $limit) {
print '<td class="left">'.$langs->trans("Total").'</td>';
if ($num < $limit && empty($offset)) {
print '<td>'.$langs->trans("Total").'</td>';
} else {
print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td>'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
}
print '<td colspan="2"></td>';
print '<td class="center">'.$total_qty.'</td>';