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

Fix var_dump

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-06 03:41:45 +01:00
parent 0e496d2191
commit 9df85a26b8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/commonobject.class.php
View File

@ -3522,6 +3522,7 @@ abstract class CommonObject
if ($elementTable == 'user') $fieldstatus = "statut";
if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
if (is_array($this->fields) && array_key_exists('status', $this->fields)) $fieldstatus = 'status';
$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
$sql .= " SET ".$fieldstatus." = ".$status;

17
htdocs/mrp/mo_production.php
View File

@ -192,7 +192,7 @@ if (empty($reshook))
setEventMessages($stockmove->error, $stockmove->errors, 'errors');
}
}
var_dump('eee '.$error);
if (! $error) {
$pos = 0;
// Record consumption
@ -254,7 +254,7 @@ var_dump('eee '.$error);
setEventMessages($stockmove->error, $stockmove->errors, 'errors');
}
}
var_dump('fff '.$error);
if (! $error) {
$pos = 0;
// Record production
@ -289,9 +289,13 @@ var_dump('eee '.$error);
$qtyremaintoconsume = 0;
$qtyremaintoproduce = 0;
if ($qtyremaintoconsume == 0 && $qtyremaintoproduce == 0) {
$object->setStatut($object::STATUS_INPROGRESS);
$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
} else {
$object->setStatut($object::STATUS_PRODUCED);
$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
}
if ($result <= 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
}
@ -524,12 +528,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($action == 'consumeandproduceall')
{
$defaultstockmovementlabel = GETPOST('inventorylabel', 'alphanohtml') ? GETPOST('inventorylabel', 'alphanohtml') : $langs->trans("ProductionForRefAndDate", $object->ref, dol_print_date(dol_now(), 'standard'));
$defaultstockmovementcode = GETPOST('inventorycode', 'alphanohtml') ? GETPOST('inventorycode', 'alphanohtml') : $object->ref.'_'.dol_print_date(dol_now(), 'dayhourlog');
//$defaultstockmovementcode = GETPOST('inventorycode', 'alphanohtml') ? GETPOST('inventorycode', 'alphanohtml') : $object->ref.'_'.dol_print_date(dol_now(), 'dayhourlog');
$defaultstockmovementcode = GETPOST('inventorycode', 'alphanohtml') ? GETPOST('inventorycode', 'alphanohtml') : $object->ref;
print '<div class="center">';
print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ConfirmProductionDesc", $langs->transnoentitiesnoconv("Confirm")).'<br></span>';
print $langs->trans("MovementLabel").': <input type="text" class="minwidth300" name="inventorylabel" value="'.$defaultstockmovementlabel.'"> &nbsp; ';
print $langs->trans("InventoryCode").': <input type="text" class="minwidth200" name="inventorycode" value="'.$defaultstockmovementcode.'"><br><br>';
print $langs->trans("InventoryCode").': <input type="text" class="maxwidth150" name="inventorycode" value="'.$defaultstockmovementcode.'"><br><br>';
print '<input type="checkbox" name="autoclose" value="1" checked="checked"> '.$langs->trans("AutoCloseMO").'<br>';
print '<input class="button" type="submit" value="'.$langs->trans("Confirm").'" name="confirm">';
print ' &nbsp; ';