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

diff --git a/SL/DB/Helper/TransNumberGenerator.pm b/SL/DB/Helper/TransNumberGenerator.pm
index 6cdc281a8cf43db7b5f7a140536584f22299cc49..cc5fc327c4e095a7017c872c40ad578ec91b318a 100644 (file)
--- a/SL/DB/Helper/TransNumberGenerator.pm
+++ b/SL/DB/Helper/TransNumberGenerator.pm
@@ -53,7 +53,8 @@ sub get_next_trans_number {
   require SL::DB::Default;
   require SL::DB::Business;
 
-  my %conditions = ( query => [ $scoping_conditions ? $scoping_conditions->($spec_type) : () ] );
+  my %conditions            = ( query => [ $scoping_conditions ? $scoping_conditions->($spec_type) : () ] );
+  my %conditions_for_in_use = ( query => [ $scoping_conditions ? $scoping_conditions->($spec_type) : () ] );
 
   my $business;
   if ($spec_type =~ m{^(?:customer|vendor)$}) {
@@ -69,15 +70,17 @@ sub get_next_trans_number {
     }
   }
 
-  my @numbers        = map { $_->$number_column } @{ $self->_get_manager_class->get_all(%conditions) };
-  my %numbers_in_use = map { ( $_ => 1 )        } @numbers;
+  my %numbers_in_use = map { ( $_->$number_column => 1 ) } @{ $self->_get_manager_class->get_all(%conditions_for_in_use) };
 
   my $range_table    = $business ? $business : SL::DB::Default->get;
   my $start_number   = $range_table->$number_range_column;
   $start_number      = $range_table->articlenumber if ($number_range_column eq 'assemblynumber') && (length($start_number) < 1);
   my $sequence       = SL::PrefixedNumber->new(number => $start_number);
 
-  $sequence->set_to_max(@numbers) if !$fill_holes_in_range;
+  if (!$fill_holes_in_range) {
+    my @numbers = map { $_->$number_column } @{ $self->_get_manager_class->get_all(%conditions) };
+    $sequence->set_to_max(@numbers) ;
+  }
 
   my $new_number = $sequence->get_next;
   $new_number    = $sequence->get_next while $numbers_in_use{$new_number};

diff --git a/SL/IC.pm b/SL/IC.pm
index b99ec2aad4ac2d8b472542b8afdff3af61646da6..3b7eb0848e171f9546a4db3cf9da75f300efbb12 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -457,6 +457,22 @@ sub save {
 
   # add assembly records
   if ($form->{item} eq 'assembly') {
+    # check additional assembly row
+    my $i = $form->{assembly_rows};
+    # if last row is not empty add them
+    if ($form->{"partnumber_$i"} ne "") {
+       $query = qq|SELECT id FROM parts WHERE partnumber = ?|;
+       my ($partid) = selectrow_query($form, $dbh, $query,$form->{"partnumber_$i"} );
+       if ( $partid ) {
+           $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+           $form->{"id_$i"} = $partid;
+           $form->{"bom_$i"} = 0;
+           $form->{assembly_rows}++;
+       }
+       else {
+           $::form->error($::locale->text("uncorrect partnumber ").$form->{"partnumber_$i"});
+       }
+    }
 
     for my $i (1 .. $form->{assembly_rows}) {
       $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
@@ -469,7 +485,6 @@ sub save {
         do_query($form, $dbh, $query, @values);
       }
     }
-
     my @a = localtime;
     $a[5] += 1900;
     $a[4]++;

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index b722e20814e5e62a81690f47a3cfa76330e6be8b..21e8d325593307c229e5f9ad4a921040d7e8e738 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -293,16 +293,16 @@ sub form_header {
   $form->{oldvcname}         =  $form->{"old$form->{vc}"};
   $form->{oldvcname}         =~ s/--.*//;
 
-  if ($form->{resubmit}) {
-    my $dispatch_to_popup = '';
-    if ($form->{format} eq "html") {
-      $dispatch_to_popup .= "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
-    }
-    # emulate click for resubmitting actions
-    $dispatch_to_popup .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
+  my $dispatch_to_popup = '';
+  if ($form->{resubmit} && ($form->{format} eq "html")) {
+    $dispatch_to_popup  = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
     $dispatch_to_popup .= "document.do.submit();";
-    $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
+  } elsif ($form->{resubmit}) {
+    # emulate click for resubmitting actions
+    $dispatch_to_popup  = "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
   }
+  $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
+
 
   my $follow_up_vc                =  $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
   $follow_up_vc                   =~ s/--\d*\s*$//;

diff --git a/locale/de/all b/locale/de/all
index e7c9de414cdadf54a49f70fd4c3fc3848bfd9b79..3fdc2a988a9658cb36ac592888b0a824d94fc180 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2763,6 +2763,7 @@ $self->{texts} = {
   'transferred out'             => 'ausgelagert',
   'trial_balance'               => 'susa',
   'unconfigured'                => 'unkonfiguriert',
+  'uncorrect partnumber '       => 'Unbekannte Teilenummer ',
   'up'                          => 'hoch',
   'use program settings'        => 'benutze Programmeinstellungen',
   'use user config'             => 'Verwende Benutzereinstellung',

diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 6f76e3f4531bbe13719462c2c3faac0b8f84142b..3a69630ba04771747e0f32a87a5817d1279fcc7b 100755 (executable)
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -40,6 +40,7 @@ my %check;
 Getopt::Long::Configure ("bundling");
 GetOptions(
   "v|verbose"   => \ my $v,
+  "V|no-verbose"   => \ my $nv,
   "a|all"       => \ $check{a},
   "o|optional!" => \ $check{o},
   "d|devel!"    => \ $check{d},
@@ -49,6 +50,15 @@ GetOptions(
   "c|color!"    => \ ( my $c = 1 ),
 );
 
+# verbos is default
+if ( $v && $nv ){
+  $v = 1;
+}elsif ($nv){
+  undef $v;
+}else{
+  $v = 1;
+}
+
 # if nothing is requested check "required"
 my $default_run;
 if (!defined $check{a}
@@ -308,9 +318,13 @@ Probe for LaTeX documentclasses and packages in master templates.
 
 Don't probe for LaTeX document classes and packages in master templates. (Useful in combination with --all)
 
-=item C<-v. --verbose>
+=item C<-v, --verbose>
+
+Print additional info for missing dependancies (enabled by default)
+
+=item C<-V, --no-verbose>
 
-Print additional info for missing dependancies
+Disable verbosity
 
 =back