Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 47b2bb2b

Von Bernd Bleßmann vor mehr als 1 Jahr hinzugefügt

  • ID 47b2bb2b25f10ba97bb24ab3aba6e18e3e58c0a3
  • Vorgänger eaf9e172
  • Nachfolger 1ced201d

Auftrags-Eingang: Controller

Unterschiede anzeigen:

js/kivi.Order.js
1 1
namespace('kivi.Order', function(ns) {
2 2
  ns.check_cv = function() {
3
    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
3
    if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
4 4
      if ($('#order_customer_id').val() === '') {
5 5
        alert(kivi.t8('Please select a customer.'));
6 6
        return false;
......
716 716
    var vc;
717 717
    var vc_id;
718 718
    var title;
719
    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
719
    if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
720 720
      vc    = 'customer';
721 721
      vc_id = $('#order_customer_id').val();
722 722
      title = kivi.t8('Customer details');
......
789 789
  ns.purchase_check_for_direct_delivery = function(params) {
790 790
    const to_type = params.to_type;
791 791

  
792
    if ($('#type').val() != 'sales_quotation' && $('#type').val() != 'sales_order') {
792
    if ($('#type').val() != 'sales_quotation' && $('#type').val() != 'sales_order_intake' && $('#type').val() != 'sales_order') {
793 793
      kivi.submit_ajax_form("controller.pl", '#order_form', {action: 'Order/save_and_order_workflow', to_type: to_type});
794 794
      return;
795 795
    }
......
858 858
    var type = $('#type').val();
859 859

  
860 860
    var number_info = '';
861
    if ($('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') {
861
    if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') {
862 862
      number_info = $('#order_ordnumber').val();
863 863
    } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation') {
864 864
      number_info = $('#order_quonumber').val();
865 865
    }
866 866

  
867 867
    var name_info = '';
868
    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
868
    if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
869 869
      name_info = $('#order_customer_id_name').val();
870 870
    } else if ($('#type').val() == 'purchase_order' || $('#type').val() == 'request_quotation') {
871 871
      name_info = $('#order_vendor_id_name').val();
......
989 989
});
990 990

  
991 991
$(function() {
992
  if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
992
  if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
993 993
    $('#order_customer_id').change(kivi.Order.reload_cv_dependent_selections);
994 994
  } else {
995 995
    $('#order_vendor_id').change(kivi.Order.reload_cv_dependent_selections);

Auch abrufbar als: Unified diff