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

qc_frequency in days and qcstatus elsewhere

Browse Source
This commit is contained in:
altairis-noe 2021-05-05 16:56:25 +02:00
parent c10b165d33
commit 94e485aa06
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/productbatch.lang
View File

@ -38,6 +38,6 @@ EndOfLife=End of life
ManufacturingDate=Manufacturing date ManufacturingDate=Manufacturing date
DestructionDate=Destruction date DestructionDate=Destruction date
FirstUseDate=First use date FirstUseDate=First use date
QCFrequency=Quality control frequency QCFrequency=Quality control frequency (in days)
InWorkingOrder=In working order InWorkingOrder=In working order
OutOfOrder=Out of order OutOfOrder=Out of order

2
htdocs/langs/fr_FR/productbatch.lang
View File

@ -37,6 +37,6 @@ EndOfLife=Date de fin de vie
ManufacturingDate=Date de fabrication ManufacturingDate=Date de fabrication
DestructionDate=Date de mise au rebut DestructionDate=Date de mise au rebut
FirstUseDate=Date de mise en service FirstUseDate=Date de mise en service
QCFrequency=Periodicité de contrôle QCFrequency=Periodicité de contrôle (en jours)
InWorkingOrder=En état de marche InWorkingOrder=En état de marche
OutOfOrder=Hors d’usage OutOfOrder=Hors d’usage

29
htdocs/product/stock/productlot_card.php
View File

@ -31,7 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('stocks', 'other', 'productbatch')); $langs->loadLangs(array('stocks', 'other', 'productbatch'));
@ -216,16 +215,6 @@ if (empty($reshook)) {
} }
} }
if ($action == 'setfk_qcstatus' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
$result = $object->setValueFrom('fk_qcstatus', GETPOST('fk_qcstatus') ? GETPOST('fk_qcstatus') : null, '', null, 'text', '', $user, 'PRODUCT_MODIFY');
if ($result < 0) {
setEventMessages($object->error, null, 'errors');
$action == 'editfk_qcstatus';
} else {
$action = 'view';
}
}
$triggermodname = 'PRODUCT_LOT_MODIFY'; // Name of trigger action code to execute when we modify record $triggermodname = 'PRODUCT_LOT_MODIFY'; // Name of trigger action code to execute when we modify record
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@ -374,7 +363,6 @@ if (empty($reshook)) {
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
$formproduct = new FormProduct($db);
$title = $langs->trans("ProductLot"); $title = $langs->trans("ProductLot");
$help_url = ''; $help_url = '';
@ -510,23 +498,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>'; print '<td>'.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
print '</tr>'; print '</tr>';
print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>'; print '<tr><td>'.$form->editfieldkey($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer).'</td>';
print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'string').'</td>'; print '<td>'.$form->editfieldval($langs->trans('QCFrequency'), 'qc_frequency', $object->qc_frequency, $object, $user->rights->stock->creer, 'numeric').'</td>';
print '</tr>'; print '</tr>';
/* print '<tr>';
print '<td class="maxwidthonsmartphone">';
print $form->editfieldkey("Status", 'fk_qcstatus', $object->fk_qcstatus, $object, $user->rights->stock->creer);
print '</td>';
print '<td class="valuefield">';
if ($action != 'editfk_qcstatus') {
$formproduct->load_cache_productbatch_qcstatus();
print $formproduct->cache_productbatch_qcstatus[$object->fk_qcstatus];
} else {
if (empty($fk_qcstatus)) {
$fk_qcstatus = $object->fk_qcstatus;
}
print $formproduct->select_productbatch_qcstatus($fk_qcstatus,'?id='.$object->id);
}
print '</td></tr>'; */
} }
// Other attributes // Other attributes