Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 1d1f3140

Von Jan Büren vor mehr als 6 Jahren hinzugefügt

Liefertermin Erinnerung für Auftrags-Controller

Falls in Mandanten-Konfig aktiviert, wird ein leerer Eintrag in
Liefertermin in Aufträgen beim Speichern oder
beim Workflow 'Speichern und Lieferschein' angemahnt.

Unterschiede anzeigen:

SL/Controller/Order.pm
1472 1472 
      combobox => [
1473 1473 
        action => [
1474 1474 
          t8('Save'),
1475 
          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts ],
1475 
          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
1476 
                                                    $::instance_conf->get_order_warn_no_deliverydate,
1477 
                                                                                                      ],
1476 1478 
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
1477 1479 
        ],
1478 1480 
        action => [
......
1483 1485 
        ],
1484 1486 
        action => [
1485 1487 
          t8('Save and Delivery Order'),
1486 
          call      => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ],
1488 
          call      => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
1489 
                                                                       $::instance_conf->get_order_warn_no_deliverydate,
1490 
                                                                                                                        ],
1487 1491 
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
1488 1492 
          only_if   => (any { $self->type eq $_ } (_sales_order_type(), _purchase_order_type()))
1489 1493 
        ],
SL/DB/MetaSetup/Default.pm
99 99 
  normalize_vc_names                        => { type => 'boolean', default => 'true' },
100 100 
  order_always_project                      => { type => 'boolean', default => 'false' },
101 101 
  order_warn_duplicate_parts                => { type => 'boolean', default => 'true' },
102 
  order_warn_no_deliverydate                => { type => 'boolean', default => 'true' },
102 103 
  parts_image_css                           => { type => 'text', default => 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;' },
103 104 
  parts_listing_image                       => { type => 'boolean', default => 'true' },
104 105 
  parts_show_image                          => { type => 'boolean', default => 'true' },
js/kivi.Order.js
35 35 
    return true;
36 36 
  };
37 37 

  		




  38
  
  
    
  ns.save = function(action, warn_on_duplicates) {


  		




  
  38
  
    
  ns.check_valid_reqdate = function() {


  		




  
  39
  
    
    if ($('#order_reqdate').val() === '') {


  		




  
  40
  
    
      alert(kivi.t8('Please select a delivery date.'));


  		




  
  41
  
    
      return false;


  		




  
  42
  
    
    } else {


  		




  
  43
  
    
      return true;


  		




  
  44
  
    
    }


  		




  
  45
  
    
  };


  		




  
  46
  
    

  		




  
  47
  
    
  ns.save = function(action, warn_on_duplicates, warn_on_reqdate) {


  		




  39
  48
  
    
    if (!ns.check_cv()) return;


  		




  40
  49
  
    
    if (warn_on_duplicates && !ns.check_save_duplicate_parts()) return;


  		




  
  50
  
    
    if (warn_on_reqdate    && !ns.check_valid_reqdate()) return;


  		




  41
  51
  
    

  		




  42
  52
  
    
    var data = $('#order_form').serializeArray();


  		




  43
  53
  
    
    data.push({ name: 'action', value: 'Order/' + action });


  		












  

    
      sql/Pg-upgrade2/defaults_order_warn_no_deliverydate.sql
    
  





  
  1
  
    
-- @tag: defaults_order_warn_no_deliverydate


  		




  
  2
  
    
-- @description: Mandantenkonfiguration: Warnung falls kein Liefertermin eingetragen wurden


  		




  
  3
  
    
-- @depends: release_3_5_2


  		




  
  4
  
    

  		




  
  5
  
    
ALTER TABLE defaults ADD COLUMN order_warn_no_deliverydate BOOLEAN DEFAULT TRUE;


  		












  

    
      templates/webpages/client_config/_features.html
    
  





  208
  208
  
    
   <td>[% L.yes_no_tag("defaults.order_warn_duplicate_parts", SELF.defaults.order_warn_duplicate_parts) %]</td>


  		




  209
  209
  
    
   <td>[% LxERP.t8("If enabled a warning will be shown in sales and purchase orders if there are two or more positions of the same part (new controller only).") %]</td>


  		




  210
  210
  
    
  </tr>


  		




  
  211
  
    
  <tr>


  		




  
  212
  
    
   <td align="right">[% LxERP.t8("Warn before saving orders without a delivery date") %]</td>


  		




  
  213
  
    
   <td>[% L.yes_no_tag("defaults.order_warn_no_deliverydate", SELF.defaults.order_warn_no_deliverydate) %]</td>


  		




  
  214
  
    
   <td>[% LxERP.t8("If enabled a warning will be shown in sales and purchase orders if there the delivery date is empty.") %]</td>


  		




  
  215
  
    
  </tr>


  		




  211
  216
  
    

  		




  212
  217
  
    
  <tr><td class="listheading" colspan="4">[% LxERP.t8("E-mail") %]</td></tr>


  		




  213
  218
  
    

  		












Auch abrufbar als:  Unified diff