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

Merge pull request #18109 from altairisfr/lot_sn_masks

Browse Source 
FIX : don't display custom masks if they are not used
This commit is contained in:
Laurent Destailleur 2021-07-08 23:42:48 +02:00 committed by GitHub
commit fb9d16a84a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/product/card.php
View File

@ -1636,42 +1636,48 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$tooltip .= '<br>'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch")); $tooltip .= '<br>'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
$tooltip .= '<br>'.$langs->trans("GenericMaskCodes5"); $tooltip .= '<br>'.$langs->trans("GenericMaskCodes5");
print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>'; print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') { if ($object->status_batch == '1' && getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK; $mask = !empty($object->batch_mask) ? $object->batch_mask : getDolGlobalString('LOT_ADVANCED_MASK');
} }
if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') { if ($object->status_batch == '2' && getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK; $mask = !empty($object->batch_mask) ? $object->batch_mask : getDolGlobalString('SN_ADVANCED_MASK');
} }
$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK; $inherited_mask_lot = getDolGlobalString('LOT_ADVANCED_MASK');
$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK; $inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');
print '<td id="field_mask">'; print '<td id="field_mask">';
print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1); print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
print '<script type="text/javascript"> print '<script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#field_mask, #mask_option").addClass("hideobject"); $("#field_mask").parent().addClass("hideobject");
var preselect = $("#status_batch option:selected"); var preselect = document.getElementById("status_batch");';
if (preselect !== "0") { if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS')) {
$("#field_mask, #mask_option").toggleClass("hideobject"); print 'if (preselect.value == "2") {
} $("#field_mask").parent().removeClass("hideobject");
$("#status_batch").on("change", function () { }';
console.log("We change batch status"); }
if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS')) {
print 'if (preselect.value == "1") {
$("#field_mask").parent().removeClass("hideobject");
}';
}
print '$("#status_batch").on("change", function () {
var optionSelected = $("option:selected", this); var optionSelected = $("option:selected", this);
var valueSelected = this.value; var valueSelected = this.value;
$("#field_mask, #mask_option").addClass("hideobject"); $("#field_mask").parent().addClass("hideobject");
'; ';
if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') { if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
print ' print '
if (this.value == 1) { if (this.value == 1) {
$("#field_mask, #mask_option").toggleClass("hideobject"); $("#field_mask").parent().removeClass("hideobject");
$("#batch_mask_input").val("'.$inherited_mask_lot.'"); $("#batch_mask_input").val("'.$inherited_mask_lot.'");
} }
'; ';
} }
if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') { if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
print ' print '
if (this.value == 2) { if (this.value == 2) {
$("#field_mask, #mask_option").toggleClass("hideobject"); $("#field_mask").parent().removeClass("hideobject");
$("#batch_mask_input").val("'.$inherited_mask_sn.'"); $("#batch_mask_input").val("'.$inherited_mask_sn.'");
} }
'; ';