Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 36761255

Von Jan Büren vor mehr als 1 Jahr hinzugefügt

  • ID 3676125590b65f667e0cb6d2e29ea35ec33637a2
  • Vorgänger ac423646
  • Nachfolger 80df6756

reverse Charge Steuerschlüssel 94, keine Steuerbuchung in acc_trans

... dennoch Steuerschlüssel für den DATEV-Export korrekt setzen

Unterschiede anzeigen:

SL/AP.pm
224 224
                   $form->{"AP_amount_chart_id_$i"});
225 225
        do_query($form, $dbh, $query, @values);
226 226

  
227
        if ($form->{"tax_$i"} != 0) {
227
        if ($form->{"tax_$i"} != 0 && !$form->{"reverse_charge_$i"}) {
228 228
          # insert detail records in acc_trans
229 229
          $query =
230 230
            qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | .
SL/Form.pm
3313 3313

  
3314 3314
    my $selected_tax = SL::DB::Manager::Tax->find_by(id => "$tax_id");
3315 3315

  
3316
    if ( $selected_tax ) {
3316
    if ( $selected_tax && $selected_tax->taxkey ne '94') {
3317 3317

  
3318 3318
      if ( $buysell eq 'sell' ) {
3319 3319
        $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;
......
3325 3325
      $self->{"taxrate_$i"} = $selected_tax->rate;
3326 3326
    };
3327 3327

  
3328
    $self->{"taxkey_$i"} = $selected_tax->taxkey if $selected_tax->taxkey eq '94';
3329

  
3328 3330
    ($self->{"amount_$i"}, $self->{"tax_$i"}) = $self->calculate_tax($self->{"amount_$i"},$self->{"taxrate_$i"},$taxincluded,$roundplaces);
3329 3331

  
3330 3332
    $netamount  += $self->{"amount_$i"};
bin/mozilla/ap.pl
846 846
    # no taxincluded for reverse charge
847 847
    my ($used_tax_id) = split(/--/, $form->{"taxchart_$i"});
848 848
    my $tax = SL::DB::Manager::Tax->find_by(id => $used_tax_id);
849
    if ($tax->reverse_charge_chart_id && $form->{taxincluded}) {
850
      $form->error($locale->text('Cannot Post AP transaction with tax included!'));
849
    # mark entry
850
    if ($tax->reverse_charge_chart_id) {
851
      $form->error($locale->text('Cannot Post AP transaction with tax included!')) if $form->{taxincluded};
852
      $form->{"reverse_charge_$i"} = 1;
851 853
    }
852 854

  
853 855
    if ($form->parse_amount(\%myconfig, $form->{"amount_$i"})) {

Auch abrufbar als: Unified diff