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

[mfinanz.git] / bin / mozilla / ic.pl

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index c9317ab876c8e98e43db7b09d4686f0f6e9e9b70..0c1ab688d993fd577608a2661cc2f3abe26d2964 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -288,12 +288,9 @@ sub update_prices {
 #  $form->header;
 #
 #  print qq|
+#  <h1>| . $locale->text('choice part') . qq|</h1>
 #  <form method=post action=ic.pl>
 #    <table width=100%>
-#     <tr>
-#      <th class=listtop colspan=6>| . $locale->text('choice part') . qq|</th>
-#     </tr>
-#        <tr height="5"></tr>
 #        <tr class=listheading>
 #          <th>&nbsp;</th>
 #          <th class=listheading>| . $locale->text('Part Number') . qq|</th>
@@ -722,11 +719,9 @@ sub addtop100 {
   my $colspan = $#column_index + 1;
 
   print qq|
+    <h1>$form->{title}</h1>
+
 <table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
 
   <tr><td colspan=$colspan>$option</td></tr>
 
@@ -1046,6 +1041,7 @@ sub generate_report {
     'sellprice'          => { 'text' => $locale->text('Sell Price'), },
     'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
     'soldtotal'          => { 'text' => $locale->text('Qty in Selected Records'), },
+    'name'               => { 'text' => $locale->text('Name in Selected Records'), },
     'transdate'          => { 'text' => $locale->text('Transdate'), },
     'unit'               => { 'text' => $locale->text('Unit'), },
     'weight'             => { 'text' => $locale->text('Weight'), },
@@ -1211,7 +1207,11 @@ sub generate_report {
 
     flash('warning', $::locale->text('Soldtotal does not make sense without any bsooqr options'));
   }
+  if ($form->{l_name} && !$bsooqr_mode) {
+    delete $form->{l_name};
 
+    flash('warning', $::locale->text('Name does not make sense without any bsooqr options'));
+  }
   IC->all_parts(\%myconfig, \%$form);
 
   my @columns = qw(
@@ -1641,7 +1641,7 @@ sub form_header {
   #                                                     payment_terms     => $form->{payment_terms},
   #                                                     all_partsgroup    => $form->{all_partsgroup}});
 
-  $form->{show_edit_buttons} = $main::auth->check_right($form->{login}, 'part_service_assembly_edit');
+  $form->{show_edit_buttons} = $main::auth->check_right($::myconfig{login}, 'part_service_assembly_edit');
 
   print $form->parse_html_template('ic/form_header');
   $lxdebug->leave_sub();
@@ -1787,9 +1787,20 @@ sub update {
 
   $auth->assert('part_service_assembly_edit');
 
+  # update checks whether pricegroups, makemodels or assembly items have been changed/added
+  # new items might have been added (and the original form might have been stored and restored)
+  # so at the end the ic form is run through check_form in io.pl
+  # The various combination of events can lead to problems with the order of parse_amount and format_amount
+  # Currently check_form parses some variables in assembly mode, but not in article or service mode
+  # This will only ever really be sanely resolved with a rewrite...
+
   # parse pricegroups. and no, don't rely on check_form for this...
   map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};
-  $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(sellprice listprice ve gv);
+
+  unless ($form->{item} eq 'assembly') {
+    # for assemblies check_form will parse sellprice and listprice, but not for parts or services
+    $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(sellprice listprice ve gv);
+  };
 
   if ($form->{item} eq 'part') {
     $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(weight rop);
@@ -1809,13 +1820,16 @@ sub update {
     if (   ($form->{"partnumber_$i"} eq "")
         && ($form->{"description_$i"} eq "")
         && ($form->{"partsgroup_$i"}  eq "")) {
+      # no new assembly item was added
 
       &check_form;
 
     } else {
-
+      # search db for newly added assemblyitems, via partnumber or description
       IC->assembly_item(\%myconfig, \%$form);
 
+      # form->{item_list} contains the possible matches, next check whether the
+      # match is unique or we need to call the page to select the item
       my $rows = scalar @{ $form->{item_list} };
 
       if ($rows) {