Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix MRP module

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-13 18:10:20 +02:00
parent 0878ee3a0f
commit dc86f9528d
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/const.php
View File

@ -215,11 +215,11 @@ print "</tr>\n";
// Line to add new record
print "\n";
print '<tr class="oddeven"><td><input type="text" class="flat" size="24" name="constname" value="'.$constname.'"></td>'."\n";
print '<tr class="oddeven nohover"><td><input type="text" class="flat minwidth100" name="constname" value="'.$constname.'"></td>'."\n";
print '<td>';
print '<input type="text" class="flat" size="30" name="constvalue" value="'.$constvalue.'">';
print '<input type="text" class="flat minwidth100" name="constvalue" value="'.$constvalue.'">';
print '</td><td>';
print '<input type="text" class="flat" size="40" name="constnote" value="'.$constnote.'">';
print '<input type="text" class="flat minwidth100" name="constnote" value="'.$constnote.'">';
print '</td>';
print '<td>';
print '</td>';

22
htdocs/product/class/product.class.php
View File

@ -3598,11 +3598,11 @@ class Product extends CommonObject
// phpcs:enable
global $conf, $user;
$sql = "SELECT sum(c.qty), date_format(c.date_valid, '%Y%m')";
$sql = "SELECT sum(d.qty), date_format(d.date_valid, '%Y%m')";
if ($mode == 'bynumber') {
$sql .= ", count(DISTINCT c.rowid)";
}
$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as d LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
if ($filteronproducttype >= 0) {
$sql .= ", ".MAIN_DB_PREFIX."product as p";
}
@ -3610,27 +3610,27 @@ class Product extends CommonObject
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
}
$sql .= " WHERE c.entity IN (".getEntity('mo').")";
$sql .= " AND c.status > 0";
$sql .= " WHERE d.entity IN (".getEntity('mo').")";
$sql .= " AND d.status > 0";
if ($this->id > 0) {
$sql .= " AND c.fk_product =".$this->id;
$sql .= " AND d.fk_product =".$this->id;
} else {
$sql .= " AND c.fk_product > 0";
$sql .= " AND d.fk_product > 0";
}
if ($filteronproducttype >= 0) {
$sql .= " AND p.rowid = c.fk_product AND p.fk_product_type =".$filteronproducttype;
$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
$sql .= " AND d.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid > 0) {
$sql .= " AND c.fk_soc = ".$socid;
$sql .= " AND d.fk_soc = ".$socid;
}
$sql .= $morefilter;
$sql .= " GROUP BY date_format(c.date_valid,'%Y%m')";
$sql .= " ORDER BY date_format(c.date_valid,'%Y%m') DESC";
$sql .= " GROUP BY date_format(d.date_valid,'%Y%m')";
$sql .= " ORDER BY date_format(d.date_valid,'%Y%m') DESC";
return $this->_get_stats($sql, $mode, $year);
}

5
htdocs/product/stats/card.php
View File

@ -104,7 +104,10 @@ if (!$id && empty($ref))
$title = $langs->trans("Statistics");
}
print load_fiche_titre($title, $mesg, 'product');
$picto = 'product';
if ($type == 1) $picto = 'service';
print load_fiche_titre($title, $mesg, $picto);
}
else
{