diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index 6d9b9844382..50be94a859d 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -38,6 +38,6 @@ EndOfLife=End of life ManufacturingDate=Manufacturing date DestructionDate=Destruction date FirstUseDate=First use date -QCFrequency=Quality control frequency +QCFrequency=Quality control frequency (in days) InWorkingOrder=In working order OutOfOrder=Out of order diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang index 86fbd5ed4f0..ce448998094 100644 --- a/htdocs/langs/fr_FR/productbatch.lang +++ b/htdocs/langs/fr_FR/productbatch.lang @@ -37,6 +37,6 @@ EndOfLife=Date de fin de vie ManufacturingDate=Date de fabrication DestructionDate=Date de mise au rebut FirstUseDate=Date de mise en service -QCFrequency=Periodicité de contrôle +QCFrequency=Periodicité de contrôle (en jours) InWorkingOrder=En état de marche OutOfOrder=Hors d’usage diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index 06bce2a4f9d..ef8dde76896 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -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.'/core/class/extrafields.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 $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 // 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); $formfile = new FormFile($db); -$formproduct = new FormProduct($db); $title = $langs->trans("ProductLot"); $help_url = ''; @@ -510,23 +498,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print '