Recommit von r1202 von skoehler: Bug 381, Auftrags-, Angebots-, Rechnungsnummern...

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index c3374b6af40e9f83c425f5e3f630e56dcf690810..75b44c1e411d8be8d62d5c04aa35dd3b1874d207 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -993,6 +993,11 @@ sub post {
 
   $form->{id} = 0 if $form->{postasnew};
 
 
   $form->{id} = 0 if $form->{postasnew};
 

+  # get new invnumber in sequence if no invnumber is given or if posasnew was requested
+  if (!$form->{invnumber} || $form->{postasnew}) {
+    $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+  }
+

   $form->redirect(  $locale->text('Invoice')
                   . " $form->{invnumber} "
                   . $locale->text('posted!'))
   $form->redirect(  $locale->text('Invoice')
                   . " $form->{invnumber} "
                   . $locale->text('posted!'))

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 67c99bdfe9f420c0525ea013ab942c441b7f3833..410a06eeb45d061c13504fe18b57e48ca5c0d55b 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1943,8 +1943,10 @@ sub save_and_close {
 
   }
 
 
   }
 

-  $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
-    unless $form->{$ordnumber};
+  # get new number in sequence if no number is given or if saveasnew was requested
+  if (!$form->{$ordumber} || $form->{saveasnew}) {
+    $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld);
+  }

 
   $form->redirect(
             $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
 
   $form->redirect(
             $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))