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

Clean code

Browse Source
This commit is contained in:
atm-lena 2022-01-26 09:49:06 +01:00
parent 25e8a2c758
commit ccacf2e89a
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/mrp/ajax/interface.php
View File

@ -1,16 +1,12 @@
<?php <?php
/** /**
* \file htdocs/mrp/ajax/ajax_bom.php * \file htdocs/mrp/ajax/interface.php
* \brief Ajax search component for Mrp. It get BOM content.
*/ */
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
if (!defined('NOREQUIRESOC')) { if (!defined('NOREQUIRESOC')) {
define('NOREQUIRESOC', '1'); define('NOREQUIRESOC', '1');
} }
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
if (!defined('NOCSRFCHECK')) { if (!defined('NOCSRFCHECK')) {
define('NOCSRFCHECK', '1'); define('NOCSRFCHECK', '1');
} }

16
htdocs/mrp/mo_production.php
View File

@ -1027,7 +1027,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($tmpproduct->status_batch) { if ($tmpproduct->status_batch) {
$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : ''); $preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">'; print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');// print $formproduct->selectLotStock('', 'batch-'.$line->id.'-'.$i, '', 0, '', $line->fk_product); print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');
} }
print '</td>'; print '</td>';
} }
@ -1324,25 +1324,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
$(document).ready(function() { $(document).ready(function() {
//Consumption : When a warehouse is selected, only the lot/serial numbers that are available in it are offered
updateselectbatchbywarehouse(); updateselectbatchbywarehouse();
//Consumption : When a lot/serial number is selected and it is only available in one warehouse, the warehouse is automatically selected
updateselectwarehousebybatch(); updateselectwarehousebybatch();
}); });
//Lorsqu'un entrepôt est sélectionné, on propose seulement les numéro de séries qui sont disponibles dans celui-ci
function updateselectbatchbywarehouse() { function updateselectbatchbywarehouse() {
var element = $("select[name*='idwarehouse']"); var element = $("select[name*='idwarehouse']");
element.change(function () { element.change(function () {
//select entrepôts
var selectwarehouse = $(this); var selectwarehouse = $(this);
//select lots/series
var selectbatch_name = selectwarehouse.attr('name').replace('idwarehouse', 'batch'); var selectbatch_name = selectwarehouse.attr('name').replace('idwarehouse', 'batch');
var selectbatch = $("datalist[id*='" + selectbatch_name + "']"); var selectbatch = $("datalist[id*='" + selectbatch_name + "']");
var selectedbatch = selectbatch.val(); var selectedbatch = selectbatch.val();
//produit de la ligne
var product_element_name = selectwarehouse.attr('name').replace('idwarehouse', 'product'); var product_element_name = selectwarehouse.attr('name').replace('idwarehouse', 'product');
$.ajax({ $.ajax({
@ -1365,7 +1363,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$.each(data, function (key, value) { $.each(data, function (key, value) {
//si aucun entrepôt sélectionné, alors c'est le stock total du num lot/serie qui s'affiche
if(selectwarehouse.val() == -1) { if(selectwarehouse.val() == -1) {
var label = " (<?php echo $langs->trans('Stock total') ?> : " + value + ")"; var label = " (<?php echo $langs->trans('Stock total') ?> : " + value + ")";
} else { } else {
@ -1384,25 +1381,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}); });
} }
//Lorsqu'un numéro de lot/série est sélectionné et qu'il n'est disponible seulement dans un entrepôt, l'entrepôt est automatiquement sélectionné
function updateselectwarehousebybatch() { function updateselectwarehousebybatch() {
$(document).on('change', 'input', function(){ $(document).on('change', 'input[name*=batch]', function(){
//select lot/série
var selectbatch = $(this); var selectbatch = $(this);
//select entrepôts
var selectwarehouse_name = selectbatch.attr('name').replace('batch', 'idwarehouse'); var selectwarehouse_name = selectbatch.attr('name').replace('batch', 'idwarehouse');
var selectwarehouse = $("select[name*='" + selectwarehouse_name + "']"); var selectwarehouse = $("select[name*='" + selectwarehouse_name + "']");
var selectedwarehouse = selectwarehouse.val(); var selectedwarehouse = selectwarehouse.val();
//si un entrepôt est déjà sélectionné, alors on ne change rien
if(selectedwarehouse != -1){ if(selectedwarehouse != -1){
return; return;
} }
//produit de la ligne
var product_element_name = selectbatch.attr('name').replace('batch', 'product'); var product_element_name = selectbatch.attr('name').replace('batch', 'product');
$.ajax({ $.ajax({