Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision bdc944ea

Von Kivitendo Admin vor fast 9 Jahren hinzugefügt

  • ID bdc944eae9567aa4bd256b56b89f6004890fc585
  • Vorgänger 5c30247d
  • Nachfolger 0c1285eb

Steuerzonen überarbeitet - Prüfung und Löschen

Nicht benutzte Steuerzonen können jetzt gelöscht werden, sowie deren
Kontenzuordnungen geändert werden (wie bei Buchungsgruppen). Siehe
Feature #70.

Schlägt die Speicherung neuer Steuerzonen fehl, weil z.B. die
Buchungsgruppenkonten fehlen, gibt es nun einen Rollback und eine
ordentliche Fehlermeldung, siehe Fehler #68.

Unterschiede anzeigen:

SL/Controller/Taxzones.pm
4 4

  
5 5
use parent qw(SL::Controller::Base);
6 6

  
7
#use List::Util qw(first);
8

  
9 7
use SL::DB::TaxZone;
10 8
use SL::Helper::Flash;
11 9
use SL::Locale::String;
......
18 16
);
19 17

  
20 18
__PACKAGE__->run_before('check_auth');
21
__PACKAGE__->run_before('load_config', only => [ qw(edit update) ]); #destroy
19
__PACKAGE__->run_before('load_config', only => [ qw(edit update delete) ]);
22 20

  
23 21
#
24 22
# actions
......
29 27

  
30 28
  my $taxzones = SL::DB::Manager::TaxZone->get_all_sorted();
31 29

  
32
  $::form->header;
33 30
  $self->render('taxzones/list',
34 31
                title    => t8('List of tax zones'),
35 32
                TAXZONES => $taxzones);
......
69 66
  $self->create_or_update;
70 67
}
71 68

  
69
sub action_delete {
70
  my ($self) = @_;
71

  
72
  # allow deletion of unused tax zones. Will fail, due to database
73
  # constraints, if tax zone is used anywhere
74

  
75
  my $db = $self->{config}->db;
76
  $db->do_transaction(sub {
77
        my $taxzone_charts = SL::DB::Manager::TaxzoneChart->get_all(where => [ taxzone_id => $self->config->id ]);
78
        foreach my $taxzonechart ( @{$taxzone_charts} ) { $taxzonechart->delete };
79
        $self->config->delete();
80
        flash_later('info',  $::locale->text('The tax zone has been deleted.'));
81
  }) || flash_later('error', $::locale->text('The tax zone is in use and cannot be deleted.'));
82

  
83
  $self->redirect_to(action => 'list');
84

  
85
}
86

  
72 87
sub action_reorder {
73 88
  my ($self) = @_;
74 89

  
......
100 115
  my $is_new = !$self->config->id;
101 116

  
102 117
  my $params = delete($::form->{config}) || { };
118

  
103 119
  delete $params->{id};
104 120

  
105
  $self->config->assign_attributes(%{ $params });
121
  my @errors;
122

  
123
  my $db = $self->config->db;
124
  $db->do_transaction( sub {
125

  
126
    # always allow editing of description and obsolete
127
    $self->config->assign_attributes( %{$params} ) ;
128

  
129
    push(@errors, $self->config->validate); # check for description
130

  
131
    if (@errors) {
132
      die @errors . "\n";
133
    };
106 134

  
107
  my @errors = $self->config->validate;
135
    $self->config->save;
108 136

  
109
  if (@errors) {
110
    flash('error', @errors);
111
    $self->show_form(title => $is_new ? t8('Add taxzone') : t8('Edit taxzone'));
112
    return;
113
  }
137
    if ( $is_new or $self->config->orphaned ) {
138
      # Save taxzone_charts
139
      my $buchungsgruppen = SL::DB::Manager::Buchungsgruppe->get_all_sorted();
114 140

  
115
  $self->config->save;
116
  $self->config->obsolete($::form->{"obsolete"});
141
      foreach my $bg (@{ $buchungsgruppen }) {
142
        my $income_accno_id  = $::form->{"income_accno_id_"  . $bg->id};
143
        my $expense_accno_id = $::form->{"expense_accno_id_" . $bg->id};
117 144

  
118
  #Save taxzone_charts for new taxzones:
119
  if ($is_new) {
120
    my $buchungsgruppen = SL::DB::Manager::Buchungsgruppe->get_all_sorted();
145
        my ($income_accno, $expense_accno);
146
        $income_accno  = SL::DB::Manager::Chart->find_by( id => $income_accno_id )  if $income_accno_id;
147
        $expense_accno = SL::DB::Manager::Chart->find_by( id => $expense_accno_id ) if $expense_accno_id;
121 148

  
122
    foreach my $bg (@{ $buchungsgruppen }) {
123
      my $taxzone_chart = SL::DB::Manager::TaxzoneChart->find_by_or_create(buchungsgruppen_id => $bg->id, taxzone_id => $self->config->id);
149
        push(@errors, t8('Buchungsgruppe #1 needs a valid income account' , $bg->description)) unless $income_accno;
150
        push(@errors, t8('Buchungsgruppe #1 needs a valid expense account', $bg->description)) unless $expense_accno;
124 151

  
125
      $taxzone_chart->taxzone_id($self->config->id);
126
      $taxzone_chart->buchungsgruppen_id($bg->id);
127
      $taxzone_chart->income_accno_id($::form->{"income_accno_id_" . $bg->id});
128
      $taxzone_chart->expense_accno_id($::form->{"expense_accno_id_" . $bg->id});
129
      $taxzone_chart->save;
152
        my $taxzone_chart = SL::DB::Manager::TaxzoneChart->find_by_or_create(buchungsgruppen_id => $bg->id, taxzone_id => $self->config->id);
153
        # if taxzonechart doesn't exist an empty new TaxzoneChart object is
154
        # created by find_by_or_create, so we have to assign buchungsgruppe and
155
        # taxzone again for the new case to work
156
        $taxzone_chart->taxzone_id($self->config->id);
157
        $taxzone_chart->buchungsgruppen_id($bg->id);
158
        $taxzone_chart->income_accno_id($income_accno->id);
159
        $taxzone_chart->expense_accno_id($expense_accno->id);
160
        $taxzone_chart->save;
161
      }
130 162
    }
131
  }
163
  } ) || die @errors ? join("\n", @errors) . "\n" : $db->error . "\n";
164
         # die with rollback of taxzone save if saving of any of the taxzone_charts fails
165
         # only show the $db->error if we haven't already identified the likely error ourselves
132 166

  
133 167
  flash_later('info', $is_new ? t8('The taxzone has been created.') : t8('The taxzone has been saved.'));
134 168
  $self->redirect_to(action => 'list');

Auch abrufbar als: Unified diff