X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBuchungsgruppen.pm;h=3f935824c9e97da7067077a95d90c081ac530064;hb=6c0a112183a4624a482305997d22f435fe794ad7;hp=aac6f73ab76b4cd40d0c202e58fd6e8535279a86;hpb=d3801bc92648bd7284b543162299fa31a0a0eb77;p=kivitendo-erp.git

diff --git a/SL/Controller/Buchungsgruppen.pm b/SL/Controller/Buchungsgruppen.pm
index aac6f73ab..3f935824c 100644
--- a/SL/Controller/Buchungsgruppen.pm
+++ b/SL/Controller/Buchungsgruppen.pm
@@ -8,7 +8,6 @@ use SL::DB::TaxZone;
 use SL::Helper::Flash;
 use SL::Locale::String;
 use SL::DB::TaxzoneChart;
-use SL::Controller::ClientConfig;
 use SL::DB::Default;
 
 use Rose::Object::MakeMethods::Generic (
@@ -53,9 +52,7 @@ sub show_form {
   my ($self, %params) = @_;
 
   $self->render('buchungsgruppen/form', %params,
-                 TAXZONES       => SL::DB::Manager::TaxZone->get_all_sorted(),
-                 ACCOUNTS       => SL::Controller::ClientConfig->init_accounts(),
-                 account_label  => sub { "$_[0]{accno}--$_[0]{description}" });
+                 TAXZONES       => SL::DB::Manager::TaxZone->get_all_sorted());
 }
 
 sub action_edit {
@@ -89,7 +86,7 @@ sub action_delete {
   # constraint, if Buchungsgruppe is connected to a part
 
   my $db = $self->{config}->db;
-  $db->do_transaction(sub {    
+  $db->do_transaction(sub {
         my $taxzone_charts = SL::DB::Manager::TaxzoneChart->get_all(where => [ buchungsgruppen_id => $self->config->id ]);
         foreach my $taxzonechart ( @{$taxzone_charts} ) { $taxzonechart->delete };
         $self->config->delete();
@@ -133,31 +130,48 @@ sub create_or_update {
   my $params = delete($::form->{config}) || { };
   delete $params->{id};
 
-  $self->config->assign_attributes(%{ $params });
+  my @errors;
 
-  my @errors = $self->config->validate;
+  my $db = $self->config->db;
+  $db->do_transaction( sub {
 
-  if (@errors) {
-    flash('error', @errors);
-    $self->show_form(title => $is_new ? t8('Add taxzone') : t8('Edit taxzone'));
-    return;
-  }
+    $self->config->assign_attributes(%{ $params }); # assign description and inventory_accno_id
+
+    @errors = $self->config->validate; # check for description and inventory_accno_id
+
+    if (@errors) {
+      die "foo" . @errors . "\n";
+    };
+
+    $self->config->save;
 
-  $self->config->save;
+    # Save or update taxzone_charts for new or unused Buchungsgruppen
+    if ($is_new or $self->config->orphaned) {
+      my $taxzones = SL::DB::Manager::TaxZone->get_all_sorted();
 
-  # Save or update taxzone_charts for new or unused Buchungsgruppen
-  if ($is_new or $self->config->orphaned) {
-    my $taxzones = SL::DB::Manager::TaxZone->get_all_sorted();
+      foreach my $tz (@{ $taxzones }) {
 
-    foreach my $tz (@{ $taxzones }) {
-      my $taxzone_chart = SL::DB::Manager::TaxzoneChart->find_by_or_create(buchungsgruppen_id => $self->config->id, taxzone_id => $tz->id);
-      $taxzone_chart->taxzone_id($tz->id);
-      $taxzone_chart->buchungsgruppen_id($self->config->id);
-      $taxzone_chart->income_accno_id($::form->{"income_accno_id_" . $tz->id});
-      $taxzone_chart->expense_accno_id($::form->{"expense_accno_id_" . $tz->id});
-      $taxzone_chart->save;
+        my $income_accno_id    = $::form->{"income_accno_id_"  . $tz->id};
+        my $expense_accno_id   = $::form->{"expense_accno_id_" . $tz->id};
+
+        my ($income_accno, $expense_accno);
+        $income_accno    = SL::DB::Manager::Chart->find_by( id => $income_accno_id  ) if $income_accno_id;
+        $expense_accno   = SL::DB::Manager::Chart->find_by( id => $expense_accno_id ) if $expense_accno_id;
+
+        push(@errors, t8('Tax zone #1 needs a valid income account'   , $tz->description)) unless $income_accno;
+        push(@errors, t8('Tax zone #1 needs a valid expense account'  , $tz->description)) unless $expense_accno;
+
+        my $taxzone_chart = SL::DB::Manager::TaxzoneChart->find_by_or_create(buchungsgruppen_id => $self->config->id, taxzone_id => $tz->id);
+        $taxzone_chart->taxzone_id($tz->id);
+        $taxzone_chart->buchungsgruppen_id($self->config->id);
+        $taxzone_chart->income_accno_id($income_accno->id);
+        $taxzone_chart->expense_accno_id($expense_accno->id);
+        $taxzone_chart->save;
+      }
     }
-  }
+  } ) || die @errors ? join("\n", @errors) . "\n" : $db->error . "\n";
+         # die with rollback of taxzone save if saving of any of the taxzone_charts fails
+         # only show the $db->error if we haven't already identified the likely error ourselves
 
   flash_later('info', $is_new ? t8('The Buchungsgruppe has been created.') : t8('The Buchungsgruppe has been saved.'));
   $self->redirect_to(action => 'list');