Revision 13193b1a
Von Tamino Steinert vor etwa 2 Jahren hinzugefügt
js/kivi.Reclamation.js | ||
---|---|---|
694 | 694 |
|
695 | 695 |
ns.purchase_reclamation_check_for_direct_delivery = function() { |
696 | 696 |
if ($('#type').val() != 'sales_reclamation') { |
697 |
kivi.submit_form_with_action($('#reclamation_form'), 'Reclamation/save_and_purchase_reclamation');
|
|
697 |
return alert(kivi.t8("Error: This is not a sales reclamation."));
|
|
698 | 698 |
} |
699 | 699 |
|
700 | 700 |
var empty = true; |
... | ... | |
704 | 704 |
shipto = $('#reclamation_shipto_id option:selected').text(); |
705 | 705 |
} else { |
706 | 706 |
$('#shipto_inputs [id^="shipto"]').each(function(idx, elt) { |
707 |
if (!empty) return true;
|
|
708 |
if (/^shipto_to_copy/.test($(elt).prop('id'))) return true;
|
|
709 |
if (/^shiptocp_gender/.test($(elt).prop('id'))) return true;
|
|
710 |
if (/^shiptocvar_/.test($(elt).prop('id'))) return true;
|
|
707 |
if (!empty) return; |
|
708 |
if (/^shipto_to_copy/.test($(elt).prop('id'))) return; |
|
709 |
if (/^shiptocp_gender/.test($(elt).prop('id'))) return; |
|
710 |
if (/^shiptocvar_/.test($(elt).prop('id'))) return; |
|
711 | 711 |
if ($(elt).val() !== '') { |
712 | 712 |
empty = false; |
713 |
return false;
|
|
713 |
return; |
|
714 | 714 |
} |
715 | 715 |
}); |
716 | 716 |
var shipto_elements = []; |
... | ... | |
720 | 720 |
shipto = shipto_elements.join('; '); |
721 | 721 |
} |
722 | 722 |
|
723 |
var use_it = false; |
|
724 | 723 |
if (!empty) { |
725 | 724 |
ns.direct_delivery_dialog(shipto); |
726 | 725 |
} else { |
727 |
kivi.submit_form_with_action($('#reclamation_form'), 'Reclamation/save_and_purchase_reclamation');
|
|
726 |
ns.save('save_and_purchase_reclamation');
|
|
728 | 727 |
} |
729 | 728 |
}; |
730 | 729 |
|
... | ... | |
735 | 734 |
$('<input type="hidden" name="use_shipto">').appendTo('#reclamation_form').val('1'); |
736 | 735 |
} |
737 | 736 |
|
738 |
kivi.submit_form_with_action($('#reclamation_form'), 'Reclamation/save_and_purchase_reclamation');
|
|
737 |
ns.save('save_and_purchase_reclamation');
|
|
739 | 738 |
}; |
740 | 739 |
|
741 | 740 |
ns.direct_delivery_dialog = function(shipto) { |
js/locale/de.js | ||
---|---|---|
71 | 71 |
"Enter longdescription":"Langtext eingeben", |
72 | 72 |
"Error: #1":"Fehler: #1", |
73 | 73 |
"Error: Name missing":"Fehler: Name fehlt", |
74 |
"Error: This is not a sales reclamation.":"Fehler: Dies ist keine Verkaufreklamaiton.", |
|
74 | 75 |
"Feb":"Feb", |
75 | 76 |
"February":"Februar", |
76 | 77 |
"File upload":"Datei Upload", |
js/locale/en.js | ||
---|---|---|
71 | 71 |
"Enter longdescription":"", |
72 | 72 |
"Error: #1":"", |
73 | 73 |
"Error: Name missing":"", |
74 |
"Error: This is not a sales reclamation.":"", |
|
74 | 75 |
"Feb":"", |
75 | 76 |
"February":"", |
76 | 77 |
"File upload":"", |
locale/de/all | ||
---|---|---|
1529 | 1529 |
'Error: Stock problem' => 'Fehler: Problem bei der Lagerbewegung', |
1530 | 1530 |
'Error: Stocking out would result in stock underrun' => 'Auslagern würde zu einem negativen Lagerbestand führen', |
1531 | 1531 |
'Error: Stocking out would result in stock underrun: #1' => 'Auslagern würde zu einem negativen Lagerbestand führen: #1', |
1532 |
'Error: This is not a sales reclamation.' => 'Fehler: Dies ist keine Verkaufreklamaiton.', |
|
1532 | 1533 |
'Error: Transfer would result in a negative target quantity.' => 'Fehler: Lagerbewegung würde zu einer negativen Zielmenge führen.', |
1533 | 1534 |
'Error: Unit missing or invalid' => 'Fehler: Einheit fehlt oder ungültig', |
1534 | 1535 |
'Error: Warehouse not found' => 'Fehler: Lager nicht gefunden', |
locale/en/all | ||
---|---|---|
1529 | 1529 |
'Error: Stock problem' => '', |
1530 | 1530 |
'Error: Stocking out would result in stock underrun' => '', |
1531 | 1531 |
'Error: Stocking out would result in stock underrun: #1' => '', |
1532 |
'Error: This is not a sales reclamation.' => '', |
|
1532 | 1533 |
'Error: Transfer would result in a negative target quantity.' => '', |
1533 | 1534 |
'Error: Unit missing or invalid' => '', |
1534 | 1535 |
'Error: Warehouse not found' => '', |
Auch abrufbar als: Unified diff
Reclamation: [FIX] überprüfe Felder bei use_direkt_delivery