Beim jedem Speichern von Kunden/Lieferanten prüfen, ob der Name angegeben ist.

Vorher wurde das nur beim reinen Speichern geprüft, nicht beim Speichern und
Schließen oder Fortfahren mit einem Beleg.

Behebt #84 (redmine).

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 403413ffc4358488bc8a873c041db216e1e7c33e..dbe18274eb1de30a9d0300f3750c8f03b138d614 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -113,6 +113,18 @@ sub action_show {
 sub _save {
   my ($self) = @_;
 
+  my @errors = $self->{cv}->validate;
+  if (@errors) {
+    flash('error', @errors);
+    $self->_pre_render();
+    $self->render(
+      'customer_vendor/form',
+      title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')),
+      %{$self->{template_args}}
+    );
+    ::end_of_request();
+  }
+
   my $db = $self->{cv}->db;
 
   $db->do_transaction(sub {
@@ -193,34 +205,23 @@ sub _save {
 sub action_save {
   my ($self) = @_;
 
-  if (!$self->{cv}->name) {
-    flash('error', t8('Customer missing!'));
-    $self->_pre_render();
-    $self->render(
-      'customer_vendor/form',
-      title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')),
-      %{$self->{template_args}}
-    );
-  } else {
-
-    $self->_save();
-
-    my @redirect_params = (
-      action => 'edit',
-      id     => $self->{cv}->id,
-      db     => ($self->is_vendor() ? 'vendor' : 'customer'),
-    );
+  $self->_save();
 
-    if ( $self->{contact}->cp_id ) {
-      push(@redirect_params, contact_id => $self->{contact}->cp_id);
-    }
+  my @redirect_params = (
+    action => 'edit',
+    id     => $self->{cv}->id,
+    db     => ($self->is_vendor() ? 'vendor' : 'customer'),
+  );
 
-    if ( $self->{shipto}->shipto_id ) {
-      push(@redirect_params, shipto_id => $self->{shipto}->shipto_id);
-    }
+  if ( $self->{contact}->cp_id ) {
+    push(@redirect_params, contact_id => $self->{contact}->cp_id);
+  }
 
-    $self->redirect_to(@redirect_params);
+  if ( $self->{shipto}->shipto_id ) {
+    push(@redirect_params, shipto_id => $self->{shipto}->shipto_id);
   }
+
+  $self->redirect_to(@redirect_params);
 }
 
 sub action_save_and_close {

diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index e3e30ddff6c2e59115579703d207050cecab7daf..048db7c101fb5e008f37263d9120197597dc6ec2 100644 (file)
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -41,6 +41,15 @@ sub _before_save_set_customernumber {
   return 1;
 }
 
+sub validate {
+  my ($self) = @_;
+
+  my @errors;
+  push @errors, $::locale->text('The customer name is missing.') if !$self->name;
+
+  return @errors;
+}
+
 sub short_address {
   my ($self) = @_;
 

diff --git a/SL/DB/Vendor.pm b/SL/DB/Vendor.pm
index ebbe8125fae8a200e5d6361cffd361a2d9a526f5..b1458efc34bfd9481f0266080587b9f439738e0d 100644 (file)
--- a/SL/DB/Vendor.pm
+++ b/SL/DB/Vendor.pm
@@ -41,6 +41,15 @@ sub _before_save_set_vendornumber {
   return 1;
 }
 
+sub validate {
+  my ($self) = @_;
+
+  my @errors;
+  push @errors, $::locale->text('The vendor name is missing.') if !$self->name;
+
+  return @errors;
+}
+
 sub displayable_name {
   my $self = shift;
 

diff --git a/locale/de/all b/locale/de/all
index aa32256c226a0593351a34cd50d9cc192655c568..885e9cab62482d2ce87b8e4d5a3ef30e4544c1d4 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2702,6 +2702,7 @@ $self->{texts} = {
   'The custom variable has been deleted.' => 'Die benutzerdefinierte Variable wurde gelöscht.',
   'The custom variable has been saved.' => 'Die benutzerdefinierte Variable wurde gespeichert.',
   'The custom variable is in use and cannot be deleted.' => 'Die benutzerdefinierte Variable ist in Benutzung und kann nicht gelöscht werden.',
+  'The customer name is missing.' => 'Der Kundenname fehlt.',
   'The database for user management and authentication does not exist. You can create let kivitendo create it with the following parameters:' => 'Die Datenbank für die Benutzeranmeldung existiert nicht. Sie können Sie von kivitendo automatisch mit den folgenden Parametern anlegen lassen:',
   'The database host is missing.' => 'Der Datenbankhost fehlt.',
   'The database name is missing.' => 'Der Datenbankname fehlt.',
@@ -2896,6 +2897,7 @@ $self->{texts} = {
   'The user has been deleted.'  => 'Der Benutzer wurde gelöscht.',
   'The user has been saved.'    => 'Der Benutzer wurde gespeichert.',
   'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' => 'Der Variablenname darf nur aus Zeichen (keine Umlaute), Ziffern und Unterstrichen bestehen. Er muss mit einem Buchstaben beginnen. Beispiel: weihnachtsgruss_verschicken',
+  'The vendor name is missing.' => 'Der Liefeantenname fehlt.',
   'The version number is missing.' => 'Die Versionsnummer fehlt.',
   'The warehouse could not be deleted because it has already been used.' => 'Das Lager konnte nicht gelöscht werden, da es bereits in Benutzung war.',
   'The warehouse does not contain any bins.' => 'Das Lager enthält keine Lagerplätze.',

diff --git a/locale/en/all b/locale/en/all
index 05375ace65c03e010787ef671899095023145bbd..62a26965b28a4b5b8c7fe97f1e12b199177f6412 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -2135,6 +2135,7 @@ $self->{texts} = {
   'The custom variable has been deleted.' => '',
   'The custom variable has been saved.' => '',
   'The custom variable is in use and cannot be deleted.' => '',
+  'The customer name is missing.' => '',
   'The database for user management and authentication does not exist. You can create let kivitendo create it with the following parameters:' => '',
   'The database host is missing.' => '',
   'The database name is missing.' => '',
@@ -2271,6 +2272,7 @@ $self->{texts} = {
   'The user has been deleted.'  => '',
   'The user has been saved.'    => '',
   'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' => '',
+  'The vendor name is missing.' => '',
   'The warehouse could not be deleted because it has already been used.' => '',
   'The warehouse does not contain any bins.' => '',
   'The warehouse or the bin is missing.' => '',