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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2022-02-15 11:46:50 +00:00
parent 1931ad3bab
commit 915a135c64
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/mrp/class/mo.class.php
View File

@ -1434,7 +1434,8 @@ class Mo extends CommonObject
* *
* @return array if OK, -1 if KO * @return array if OK, -1 if KO
*/ */
public function getMoChilds(){ public function getMoChilds()
{
$TMoChilds = array(); $TMoChilds = array();
$error = 0; $error = 0;
@ -1442,16 +1443,16 @@ class Mo extends CommonObject
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_mo as mo_child"; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_mo as mo_child";
$sql.= " WHERE fk_parent_line IN "; $sql.= " WHERE fk_parent_line IN ";
$sql.= " (SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production as line_parent"; $sql.= " (SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production as line_parent";
$sql.= " WHERE fk_mo=".((int)$this->id).")"; $sql.= " WHERE fk_mo=".((int) $this->id).")";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if($resql){ if ($resql) {
if($this->db->num_rows($resql) > 0){ if ($this->db->num_rows($resql) > 0) {
while($obj = $this->db->fetch_object($resql)){ while ($obj = $this->db->fetch_object($resql)) {
$MoChild = new Mo($this->db); $MoChild = new Mo($this->db);
$res = $MoChild->fetch($obj->rowid); $res = $MoChild->fetch($obj->rowid);
if($res > 0) $TMoChilds[$MoChild->id] = $MoChild; if ($res > 0) $TMoChilds[$MoChild->id] = $MoChild;
else $error++; else $error++;
} }
} }
@ -1459,7 +1460,7 @@ class Mo extends CommonObject
$error++; $error++;
} }
if($error){ if ($error) {
return -1; return -1;
} else { } else {
return $TMoChilds; return $TMoChilds;
@ -1471,22 +1472,23 @@ class Mo extends CommonObject
* *
* @return object Mo if OK, -1 if KO, 0 if not exist * @return object Mo if OK, -1 if KO, 0 if not exist
*/ */
public function getMoParent(){ public function getMoParent()
{
$MoParent = new Mo($this->db); $MoParent = new Mo($this->db);
$error = 0; $error = 0;
$sql = "SELECT lineparent.fk_mo as id_moparent FROM ".MAIN_DB_PREFIX."mrp_mo as mo"; $sql = "SELECT lineparent.fk_mo as id_moparent FROM ".MAIN_DB_PREFIX."mrp_mo as mo";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON mo.fk_parent_line = lineparent.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON mo.fk_parent_line = lineparent.rowid";
$sql.= " WHERE mo.rowid = ".((int)$this->id); $sql.= " WHERE mo.rowid = ".((int) $this->id);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if($resql){ if ($resql) {
if($this->db->num_rows($resql) > 0){ if ($this->db->num_rows($resql) > 0) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$res = $MoParent->fetch($obj->id_moparent); $res = $MoParent->fetch($obj->id_moparent);
if($res < 0) $error++; if ($res < 0) $error++;
} else { } else {
return 0; return 0;
} }
@ -1494,7 +1496,7 @@ class Mo extends CommonObject
$error++; $error++;
} }
if($error){ if ($error) {
return -1; return -1;
} else { } else {
return $MoParent; return $MoParent;

2
htdocs/mrp/mo_card.php
View File

@ -568,7 +568,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
//Mo Parent //Mo Parent
$mo_parent = $object->getMoParent(); $mo_parent = $object->getMoParent();
if(is_object($mo_parent)) { if (is_object($mo_parent)) {
print '<tr class="field_fk_mo_parent">'; print '<tr class="field_fk_mo_parent">';
print '<td class="titlefield fieldname_fk_mo_parent">' . $langs->trans('MOParent') . '</td>'; print '<td class="titlefield fieldname_fk_mo_parent">' . $langs->trans('MOParent') . '</td>';
print '<td class="valuefield fieldname_fk_mo_parent">' .$mo_parent->getNomUrl(1).'</td>'; print '<td class="valuefield fieldname_fk_mo_parent">' .$mo_parent->getNomUrl(1).'</td>';

3
htdocs/mrp/tpl/linkedobjectblock.tpl.php
View File

@ -45,7 +45,6 @@ $res = $mo_static->fetch($object->id);
$TMoChilds = $mo_static->getMoChilds(); $TMoChilds = $mo_static->getMoChilds();
foreach ($TMoChilds as $key => $objectlink) { foreach ($TMoChilds as $key => $objectlink) {
$ilink++; $ilink++;
$trclass = 'oddeven'; $trclass = 'oddeven';
@ -59,7 +58,7 @@ foreach ($TMoChilds as $key => $objectlink) {
echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>'; echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
echo '<td class="linkedcol-ref" align="center">'; echo '<td class="linkedcol-ref" align="center">';
// $result = $product_static->fetch($objectlink->fk_product); // $result = $product_static->fetch($objectlink->fk_product);
print '</td>'; print '</td>';
echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>'; echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
echo '<td class="linkedcol-amount right">-</td>'; echo '<td class="linkedcol-amount right">-</td>';