Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a3b8cfa7

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

  • ID a3b8cfa7b754629f39ee42e1cadd88d013666a14
  • Vorgänger c1ef3aff
  • Nachfolger 29254bae

fixt: #345 Mahnungsersteller im Ausdruck konfigurierbar machen

Im Menüpunkt Mahnungen konfigurieren, kann man nun wählen, ob
der aktuelle Mitarbeiter für die Mahnung/Zahlungserinnerung gesetzt ist
oder der ursprüngliche Mitarbeiter/Ersteller der Rechnung

Unterschiede anzeigen:

SL/DN.pm
38 38 
use SL::Common;
39 39 
use SL::DBUtils;
40 40 
use SL::DB::Default;
41 
use SL::DB::Employee;
41 42 
use SL::GenericTranslations;
42 43 
use SL::IS;
43 44 
use SL::Mailer;
......
71 72 
  }
72 73 

  		




  73
  74
  
    
  $query =


  		




  74
  
  
    
    qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar


  		




  
  75
  
    
    qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar, dunning_creator


  		




  75
  76
  
    
       FROM defaults|;


  		




  76
  
  
    
  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query);


  		




  
  77
  
    
  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}, $form->{dunning_creator})


  		




  
  78
  
    
    = selectrow_query($form, $dbh, $query);


  		




  77
  79
  
    

  		




  78
  80
  
    
  $main::lxdebug->leave_sub();


  		




  79
  81
  
    
}


  		




  ......




  135
  137
  
    
    }


  		




  136
  138
  
    
  }


  		




  137
  139
  
    

  		




  138
  
  
    
  $query  = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?|;


  		




  139
  
  
    
  @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}));


  		




  
  140
  
    
  $query  = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?,


  		




  
  141
  
    
               dunning_creator = ?|;


  		




  
  142
  
    
  @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}),


  		




  
  143
  
    
             $form->{dunning_creator});


  		




  140
  144
  
    
  do_query($form, $dbh, $query, @values);


  		




  141
  145
  
    

  		




  142
  146
  
    
  return 1;


  		




  ......




  907
  911
  
    
  push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename",


  		




  908
  912
  
    
                                           'name'     => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" };


  		




  909
  913
  
    

  		




  910
  
  
    
  $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});


  		




  
  914
  
    
  my $employee_id = ($::instance_conf->get_dunning_creator eq 'invoice_employee') ?


  		




  
  915
  
    
                      $form->{employee_id}                                        :


  		




  
  916
  
    
                      SL::DB::Manager::Employee->current->id;


  		




  
  917
  
    

  		




  
  918
  
    
  $form->get_employee_data('prefix' => 'employee', 'id' => $employee_id);


  		




  911
  919
  
    
  $form->get_employee_data('prefix' => 'salesman', 'id' => $form->{salesman_id});


  		




  912
  920
  
    

  		




  913
  921
  
    
  $form->{attachment_type}    = "dunning";


  		












Auch abrufbar als:  Unified diff