Erste Überarbeitung "Prüfen beim Speichern, ob Dokument geändert wurde."

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 81b5370b7f579c60877f6ccc98222a99c385fad9..645544eec003a6ad3259e87d4115a67ac5dd759d 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2604,18 +2604,21 @@ sub all_vc {
 }
 
 sub mtime_ischanged {
 }
 
 sub mtime_ischanged {

-  my ($self, $relation,$option) = @_;
-  #$main::lxdebug->message(LXDebug->DEBUG2(),"mtime_ischanged from rel=".$relation." id=".$id);
-  if ( ! $self->{id} ) { return ; }
+  my ($self, $relation, $option) = @_;

 
 

-  my $query = "SELECT mtime, itime FROM ".$relation." WHERE id = ?";
+  return unless $self->{id};  # maybe better croak, but i have no api doc to refer to ...
+
+  my $query = "SELECT mtime, itime FROM " . $relation . " WHERE id = ?";

   my $ref = selectfirst_hashref_query($self, $self->get_standard_dbh, $query, $self->{id});
   $ref->{mtime} = $ref->{itime} if !$ref->{mtime};
   my $ref = selectfirst_hashref_query($self, $self->get_standard_dbh, $query, $self->{id});
   $ref->{mtime} = $ref->{itime} if !$ref->{mtime};

-  #$main::lxdebug->message(LXDebug->DEBUG2(),"my  mtime=".$self->{lastmtime}." new mtime=".$ref->{mtime});
+

   if ($self->{lastmtime} && $self->{lastmtime} ne $ref->{mtime} ) {
       my $etxt = $main::locale->text("The document has been changed from other user. Please reopen it in another window and copy the changes to the new window");
   if ($self->{lastmtime} && $self->{lastmtime} ne $ref->{mtime} ) {
       my $etxt = $main::locale->text("The document has been changed from other user. Please reopen it in another window and copy the changes to the new window");

+

       $etxt = $main::locale->text("The document has been changed from other user. No mail was sent. Please reopen it in another window and copy the changes to the new window")
       $etxt = $main::locale->text("The document has been changed from other user. No mail was sent. Please reopen it in another window and copy the changes to the new window")

-                                 if  defined $option && $option eq 'mail';
+        if ($option eq 'mail');
+      # ^^ I prefer:
+      # my $etxt = ($option eq 'mail') ? locale1 : locale2;

       $self->error($main::locale->text($etxt));
     ::end_of_request();
   }
       $self->error($main::locale->text($etxt));
     ::end_of_request();
   }


@@ -2772,7 +2775,7 @@ sub create_links {
       qq|SELECT
            a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid,
            a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes,
       qq|SELECT
            a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid,
            a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes,

-           a.mtime,a.itime,
+           a.mtime, a.itime,

            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
            a.globalproject_id, ${extra_columns}
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
            a.globalproject_id, ${extra_columns}


@@ -2789,7 +2792,7 @@ sub create_links {
     foreach my $key (keys %$ref) {
       $self->{$key} = $ref->{$key};
     }
     foreach my $key (keys %$ref) {
       $self->{$key} = $ref->{$key};
     }

-    $self->{mtime} = $self->{itime} if ! $self->{mtime};
+    $self->{mtime} ||= $self->{itime};

     $self->{lastmtime} = $self->{mtime};
     my $transdate = "current_date";
     if ($self->{transdate}) {
     $self->{lastmtime} = $self->{mtime};
     my $transdate = "current_date";
     if ($self->{transdate}) {