OE.pm: SL::TransNumber anstelle von Form->update_defaults für Nummernkreise nutzen

diff --git a/SL/OE.pm b/SL/OE.pm
index 797eb97178c089fc8a5df87b298cfadaadae24f2..3d92746b55db2bfcf5beb45bc65a4dd2bc5eb427 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -46,6 +46,7 @@ use SL::DB::Status;
 use SL::DB::Tax;
 use SL::DBUtils;
 use SL::IC;
 use SL::DB::Tax;
 use SL::DBUtils;
 use SL::IC;

+use SL::TransNumber;

 
 use strict;
 
 
 use strict;
 


@@ -314,6 +315,10 @@ sub save {
 
   my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
 
 
   my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
 

+  my $number_field         = $form->{type} =~ m{order} ? 'ordnumber' : 'quonumber';
+  my $trans_number         = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{$number_field}, id => $form->{id});
+  $form->{$number_field} ||= $trans_number->create_unique;
+

   if ($form->{id}) {
     $query = qq|DELETE FROM custom_variables
                 WHERE (config_id IN (SELECT id FROM custom_variable_configs WHERE module = 'IC'))
   if ($form->{id}) {
     $query = qq|DELETE FROM custom_variables
                 WHERE (config_id IN (SELECT id FROM custom_variable_configs WHERE module = 'IC'))

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 3ee71e67f548c995b1a0f08e0f374de549c882a6..b6c22624c8c2b30f04a34bfe6538d78e510088db 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1122,10 +1122,8 @@ sub save_and_close {
 
   }
 
 
   }
 

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

 
   relink_accounts();
 
 
   relink_accounts();
 


@@ -1232,10 +1230,6 @@ sub save {
 
   }
 
 
   }
 

-  # value of $ordnumber is ordnumber or quonumber
-  $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
-    unless $form->{$ordnumber};
-

   relink_accounts();
 
   OE->save(\%myconfig, \%$form);
   relink_accounts();
 
   OE->save(\%myconfig, \%$form);