X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Order.js;h=938cfb7d087be570bddcf69b9834f344dc4d8e4c;hb=e28ec8115ffd3411bd7ffd0bfaf5dab35f807c2a;hp=016212875a0b4426a98bcc553b3d0fb8be364bb3;hpb=e8a621506e8476de38901b6b01109d73075741f2;p=kivitendo-erp.git diff --git a/js/kivi.Order.js b/js/kivi.Order.js index 016212875..938cfb7d0 100644 --- a/js/kivi.Order.js +++ b/js/kivi.Order.js @@ -28,7 +28,7 @@ namespace('kivi.Order', function(ns) { } if (pos.length > 0) { - question = question || kivi.t8("Do you really want to save?"); + question = question || kivi.t8("Do you really want to continue?"); return confirm(kivi.t8("There are duplicate parts at positions") + "\n" + pos.join(', ') + "\n" + question); @@ -51,7 +51,6 @@ namespace('kivi.Order', function(ns) { if (warn_on_reqdate && !ns.check_valid_reqdate()) return; var data = $('#order_form').serializeArray(); - data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options data.push({ name: 'action', value: 'Order/' + action }); $.post("controller.pl", data, kivi.eval_json_result); @@ -83,23 +82,11 @@ namespace('kivi.Order', function(ns) { var data = $('#order_form').serializeArray(); data = data.concat($('#print_options_form').serializeArray()); - data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options data.push({ name: 'action', value: 'Order/print' }); $.post("controller.pl", data, kivi.eval_json_result); }; - ns.email = function(warn_on_duplicates) { - if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to send by mail?"))) return; - if (!ns.check_cv()) return; - - var data = $('#order_form').serializeArray(); - data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options - data.push({ name: 'action', value: 'Order/show_email_dialog' }); - - $.post("controller.pl", data, kivi.eval_json_result); - }; - var email_dialog; ns.setup_send_email_dialog = function() { @@ -150,7 +137,6 @@ namespace('kivi.Order', function(ns) { var data = $('#order_form').serializeArray(); data = data.concat($('[name^="email_form."]').serializeArray()); data = data.concat($('[name^="print_options."]').serializeArray()); - data.push({ name: 'order.language_id', value: $('#language_id').val() }); // language from print options data.push({ name: 'action', value: 'Order/send_email' }); $.post("controller.pl", data, kivi.eval_json_result); }; @@ -164,6 +150,7 @@ namespace('kivi.Order', function(ns) { }; ns.reload_cv_dependent_selections = function() { + $('#order_shipto_id').val(''); var data = $('#order_form').serializeArray(); data.push({ name: 'action', value: 'Order/customer_vendor_changed' }); @@ -174,9 +161,29 @@ namespace('kivi.Order', function(ns) { $(event.target).val(kivi.format_amount(kivi.parse_amount($(event.target).val()), -2)); }; + ns.reformat_number_as_null_number = function(event) { + if ($(event.target).val() === '') { + return; + } + ns.reformat_number(event); + }; + ns.update_exchangerate = function(event) { - var rate_input = $('#order_exchangerate_as_number'); - rate_input.attr('name', ''); + if (!ns.check_cv()) { + $('#order_currency_id').val($('#old_currency_id').val()); + return; + } + + var rate_input = $('#order_exchangerate_as_null_number'); + // unset exchangerate if currency changed + if ($('#order_currency_id').val() !== $('#old_currency_id').val()) { + rate_input.val(''); + } + + // only set exchangerate if unset + if (rate_input.val() !== '') { + return; + } var data = $('#order_form').serializeArray(); data.push({ name: 'action', value: 'Order/update_exchangerate' }); @@ -187,22 +194,21 @@ namespace('kivi.Order', function(ns) { method: 'POST', dataType: 'json', success: function(data){ - if (data.currency_name) { + if (!data.is_standard) { $('#currency_name').text(data.currency_name); - var rate_text = $('#exchangerate_text'); if (data.exchangerate) { - rate_text.text(data.exchangerate); - rate_input.hide(); + rate_input.val(data.exchangerate); } else { - rate_text.text(''); - rate_input.show().attr('name', rate_input.data('name')).val(0); + rate_input.val(''); } $('#exchangerate_settings').show(); } else { + rate_input.val(''); $('#exchangerate_settings').hide(); } - if ($('#order_currency_id').val() != $('#old_currency_id').val() || data.exchangerate != $('#old_exchangerate').val()) { - kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please update prices.')); + if ($('#order_currency_id').val() != $('#old_currency_id').val() || + !data.is_standard && data.exchangerate != $('#old_exchangerate').val()) { + kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.')); } $('#old_currency_id').val($('#order_currency_id').val()); $('#old_exchangerate').val(data.exchangerate); @@ -211,9 +217,9 @@ namespace('kivi.Order', function(ns) { }; ns.exchangerate_changed = function(event) { - if (kivi.parse_amount($('#order_exchangerate_as_number').val()) != kivi.parse_amount($('#old_exchangerate').val())) { - kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please update prices.')); - $('#old_exchangerate').val($('#order_exchangerate_as_number').val()); + if (kivi.parse_amount($('#order_exchangerate_as_null_number').val()) != kivi.parse_amount($('#old_exchangerate').val())) { + kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.')); + $('#old_exchangerate').val($('#order_exchangerate_as_null_number').val()); } }; @@ -574,40 +580,15 @@ namespace('kivi.Order', function(ns) { var position = $(row).find('[name="position"]').html(); var partnumber = $(row).find('[name="partnumber"]').html(); var description_elt = $(row).find('[name="order.orderitems[].description"]'); - var description = description_elt.val(); var longdescription_elt = $(row).find('[name="order.orderitems[].longdescription"]'); - var longdescription; - - if (!longdescription_elt.length) { - var data = [ - { name: 'action', value: 'Order/get_item_longdescription' }, - { name: 'type', value: $('#type').val() }, - { name: 'item_id', value: $(row).find('[name="order.orderitems[+].id"]').val() }, - { name: 'parts_id', value: $(row).find('[name="order.orderitems[].parts_id"]').val() } - ]; - - $.ajax({ - url: 'controller.pl', - data: data, - method: "GET", - async: false, - dataType: 'text', - success: function(val) { - longdescription = val; - } - }); - } else { - longdescription = longdescription_elt.val(); - } var params = { runningnumber: position, partnumber: partnumber, - description: description, - default_longdescription: longdescription, + description: description_elt.val(), + default_longdescription: longdescription_elt.val(), set_function: function(val) { - longdescription_elt.remove(); - $('').insertAfter(description_elt).val(val); + longdescription_elt.val(val); } }; @@ -826,6 +807,115 @@ namespace('kivi.Order', function(ns) { return true; }; + ns.edit_custom_shipto = function() { + if (!ns.check_cv()) return; + + kivi.SalesPurchase.edit_custom_shipto(); + }; + + ns.purchase_order_check_for_direct_delivery = function() { + if ($('#type').val() != 'sales_order') { + kivi.submit_form_with_action($('#order_form'), 'Order/purchase_order'); + } + + var empty = true; + var shipto; + if ($('#order_shipto_id').val() !== '') { + empty = false; + shipto = $('#order_shipto_id option:selected').text(); + } else { + $('#shipto_inputs [id^="shipto"]').each(function(idx, elt) { + if (!empty) return true; + if (/^shipto_to_copy/.test($(elt).prop('id'))) return true; + if (/^shiptocp_gender/.test($(elt).prop('id'))) return true; + if (/^shiptocvar_/.test($(elt).prop('id'))) return true; + if ($(elt).val() !== '') { + empty = false; + return false; + } + }); + var shipto_elements = []; + $([$('#shiptoname').val(), $('#shiptostreet').val(), $('#shiptozipcode').val(), $('#shiptocity').val()]).each(function(idx, elt) { + if (elt !== '') shipto_elements.push(elt); + }); + shipto = shipto_elements.join('; '); + } + + var use_it = false; + if (!empty) { + ns.direct_delivery_dialog(shipto); + } else { + kivi.submit_form_with_action($('#order_form'), 'Order/purchase_order'); + } + }; + + ns.direct_delivery_callback = function(accepted) { + $('#direct-delivery-dialog').dialog('close'); + + if (accepted) { + $('').appendTo('#order_form').val('1'); + } + + kivi.submit_form_with_action($('#order_form'), 'Order/purchase_order'); + }; + + ns.direct_delivery_dialog = function(shipto) { + $('#direct-delivery-dialog').remove(); + + var text1 = kivi.t8('You have entered or selected the following shipping address for this customer:'); + var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?'); + var html = '

' + text1 + '

' + shipto + '

' + text2 + '

'; + html = html + '

'; + html = html + ''; + html = html + ' '; + html = html + ''; + html = html + '

'; + $(html).hide().appendTo('#order_form'); + + kivi.popup_dialog({id: 'direct-delivery-dialog', + dialog: {title: kivi.t8('Carry over shipping address'), + height: 300, + width: 500 }}); + }; + + ns.follow_up_window = function() { + var id = $('#id').val(); + var type = $('#type').val(); + + var number_info = ''; + if ($('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') { + number_info = $('#order_ordnumber').val(); + } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation') { + number_info = $('#order_quonumber').val(); + } + + var name_info = ''; + if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') { + name_info = $('#order_customer_id_name').val(); + } else if ($('#type').val() == 'purchase_order' || $('#type').val() == 'request_quotation') { + name_info = $('#order_vendor_id_name').val(); + } + + var info = ''; + if (number_info !== '') { info += ' (' + number_info + ')' } + if (name_info !== '') { info += ' (' + name_info + ')' } + + if (!$('#follow_up_rowcount').lenght) { + $('').appendTo('#order_form'); + $('').appendTo('#order_form'); + $('').appendTo('#order_form'); + $('').appendTo('#order_form'); + $('').appendTo('#order_form'); + } + $('#follow_up_rowcount').val(1); + $('#follow_up_trans_id_1').val(id); + $('#follow_up_trans_type_1').val(type); + $('#follow_up_trans_info_1').val(info); + $('#follow_up_trans_subject_1').val($('#order_transaction_description').val()); + + follow_up_window(); + }; + }); $(function() { @@ -837,7 +927,7 @@ $(function() { $('#order_currency_id').change(kivi.Order.update_exchangerate); $('#order_transdate_as_date').change(kivi.Order.update_exchangerate); - $('#order_exchangerate_as_number').change(kivi.Order.exchangerate_changed); + $('#order_exchangerate_as_null_number').change(kivi.Order.exchangerate_changed); if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) { $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) }); @@ -885,4 +975,6 @@ $(function() { return false; }); + $('.reformat_number_as_null_number').change(kivi.Order.reformat_number_as_null_number); + });