Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 0b2c5e93effee753ea4f6e28324848667c495d05..4dca557f903ecc51e57d2e5f4cf1a3061674c3dd 100644 (file)
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -72,8 +72,9 @@ sub flatten_to_form {
     _copy_custom_variables($item, $form, 'ic_cvar_', "_${idx}");
 
     if (ref($self) eq 'SL::DB::Invoice') {
-      $form->{"deliverydate_oe_${idx}"} = $item->deliverydate->to_lxoffice;
-      $form->{"reqdate_${idx}"}         = $item->deliverydate->to_lxoffice;
+      my $date                          = $item->deliverydate ? $item->deliverydate->to_lxoffice : undef;
+      $form->{"deliverydate_oe_${idx}"} = $date;
+      $form->{"reqdate_${idx}"}         = $date;
     }
   }
 

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 99c097bfba187f65cca073433e623c49db155e07..a52677f95a6c46bd410cd8d7b772c1c611b7d02e 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1190,23 +1190,28 @@ sub show_am_history {
   my $callback     = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
   $form->{order} ||= 'h.itime--1';
 
-  my %search = ( "Artikelnummer"          => "parts",
-                 "Kundennummer"           => "customer",
-                 "Lieferantennummer"      => "vendor",
-                 "Projektnummer"          => "project",
-                 "Buchungsnummer"         => "oe",
-                 "Eingangsrechnungnummer" => "ap",
-                 "Ausgangsrechnungnummer" => "ar",
-                 "Mahnungsnummer"         => "dunning"
-    );
+  # my %search = ( "Artikelnummer"          => "parts",
+  #                "Kundennummer"           => "customer",
+  #                "Lieferantennummer"      => "vendor",
+  #                "Projektnummer"          => "project",
+  #                "Auftragsnummer"         => "oe",
+  #                "Angebotsnummer"         => "oe",
+  #                "Eingangsrechnungnummer" => "ap",
+  #                "Ausgangsrechnungnummer" => "ar",
+  #                "Mahnungsnummer"         => "dunning",
+  #                "Buchungsnummer"         => "gl",
+  # );
+
   my %searchNo = ( "Artikelnummer"          => "partnumber",
                    "Kundennummer"           => "customernumber",
                    "Lieferantennummer"      => "vendornumber",
                    "Projektnummer"          => "projectnumber",
-                   "Buchungsnummer"         => "ordnumber",
+                   "Auftragsnummer"         => "ordnumber",
+                   "Angebotsnummer"         => "quonumber",
                    "Eingangsrechnungnummer" => "invnumber",
                    "Ausgangsrechnungnummer" => "invnumber",
-                   "Mahnungsnummer"         => "dunning_id"
+                   "Mahnungsnummer"         => "dunning_id",
+                   "Buchungsnummer"         => "gltransaction"
     );
 
   my $dbh = $form->dbconnect(\%myconfig);

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index b1c640a2f59a02436c077d4864d6ee8aa0d896e4..e66376bfd4481fdcad7491b4b568f69132ae4da8 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -962,8 +962,9 @@ sub yes {
   if (GL->delete_transaction(\%myconfig, \%$form)){
     # saving the history
       if(!exists $form->{addition} && $form->{id} ne "") {
-        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+        $form->{snumbers} = qq|gltransaction_| . $form->{id};
         $form->{addition} = "DELETED";
+        $form->{what_done} = "gl_transaction";
         $form->save_history;
       }
     # /saving the history
@@ -1134,9 +1135,9 @@ sub post_transaction {
   undef($form->{callback});
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-    $form->{addition} = "SAVED";
-    $form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id};
+    $form->{snumbers} = qq|gltransaction_| . $form->{id};
+    $form->{addition} = "POSTED";
+    $form->{what_done} = "gl transaction";
     $form->save_history;
   }
   # /saving the history
@@ -1203,8 +1204,9 @@ sub storno {
 
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-    $form->{snumbers} = "ordnumber_$form->{ordnumber}";
+    $form->{snumbers} = qq|gltransaction_| . $form->{id};
     $form->{addition} = "STORNO";
+    $form->{what_done} = "gl_transaction";
     $form->save_history;
   }
   # /saving the history

diff --git a/locale/de/all b/locale/de/all
index 5136a68e34cbfc2b81c3ac26c474cc0a854e6341..7464deed7d114ca26e396d8a330ab78b161400f9 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3112,6 +3112,7 @@ $self->{texts} = {
   'found'                       => 'Gefunden',
   'from (time)'                 => 'von',
   'general_ledger_list'         => 'buchungsjournal',
+  'gl_transaction'              => 'Dialogbuchung',
   'h'                           => 'h',
   'history'                     => 'Historie',
   'history search engine'       => 'Historien Suchmaschine',

diff --git a/templates/webpages/common/search_history.html b/templates/webpages/common/search_history.html
index 8076bd8bb592802d37bb01412475176dcd0df9cf..53b92e87646f9a734c644480d3281811e6ae7e07 100644 (file)
--- a/templates/webpages/common/search_history.html
+++ b/templates/webpages/common/search_history.html
@@ -16,10 +16,12 @@
         <option name="Kundennummer" value="Kundennummer" id="Kundennummer">[% 'Customer Number' | $T8 %]</option>
         <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">[% 'Vendor Number' | $T8 %]</option>
         <option name="Projektnummer" value="Projektnummer" id="Projektnummer">[% 'Project Number' | $T8 %]</option>
-        <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">[% 'ID' | $T8 %]</option>
+        <option name="Auftragsnummer" value="Auftragsnummer" id="Auftragsnummer">[% 'Order Number' | $T8 %]</option>
+        <option name="Angebotsnummer" value="Angebotsnummer" id="Angebotsnummer">[% 'Quotation Number' | $T8 %]</option>
         <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">[% 'Incoming invoice number' | $T8 %]</option>
         <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">[% 'Sales invoice number' | $T8 %]</option>
         <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">[% 'Dunning number' | $T8 %]</option>
+        <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">[% 'ID' | $T8 %]</option>
       </select>
     </td>
   </tr>