From 5bc5af9f93a0ed3edfa6fa9aba7aa80cab182ae9 Mon Sep 17 00:00:00 2001
From: "G. Richardson" <grichardson@kivitec.de>
Date: Sat, 11 Nov 2017 10:43:52 +0100
Subject: [PATCH] =?utf8?q?Ausdruck=20der=20St=C3=BCckliste=20/=20bom=20in?=
 =?utf8?q?=20Belegen=20repariert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Die alte Hidden in display_row "assembly" durch part_type ersetzt, und
stattdessen auf part_type = assembly prüfen.

behebt #320
---
 SL/DO.pm          | 2 +-
 SL/IS.pm          | 6 +++---
 SL/OE.pm          | 2 +-
 bin/mozilla/io.pl | 2 +-
 doc/changelog     | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/SL/DO.pm b/SL/DO.pm
index 3dde867c2..70fa87641 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -1011,7 +1011,7 @@ sub order_details {
       push @{ $form->{TEMPLATE_ARRAYS}{si_unit}[$si_position-1] },          $si->{unit};
     }
 
-    if ($form->{"assembly_$i"}) {
+    if ($form->{"part_type_$i"} eq 'assembly') {
       $sameitem = "";
 
       # get parts and push them onto the stack
diff --git a/SL/IS.pm b/SL/IS.pm
index 7ff850039..3b90ceaa5 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -434,7 +434,7 @@ sub invoice_details {
       }
       my $tax_rate = $taxrate * 100;
       push(@{ $form->{TEMPLATE_ARRAYS}->{tax_rate} }, qq|$tax_rate|);
-      if ($form->{"assembly_$i"}) {
+      if ($form->{"part_type_$i"} eq 'assembly') {
         $sameitem = "";
 
         # get parts and push them onto the stack
@@ -865,9 +865,9 @@ sub _post_invoice {
 
       next if $payments_only;
 
-      if ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"}) {
+      if ($form->{"inventory_accno_$i"} || $form->{"part_type_$i"} eq 'assembly') {
 
-        if ($form->{"assembly_$i"}) {
+        if ($form->{"part_type_$i"} eq 'assembly') {
           # record assembly item as allocated
           &process_assembly($dbh, $myconfig, $form, $position, $form->{"id_$i"}, $baseqty);
 
diff --git a/SL/OE.pm b/SL/OE.pm
index a0a0abfc8..a2dea99ec 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1505,7 +1505,7 @@ sub order_details {
       $tax_rate = $taxrate * 100;
       push(@{ $form->{TEMPLATE_ARRAYS}->{tax_rate} }, qq|$tax_rate|);
 
-      if ($form->{"assembly_$i"}) {
+      if ($form->{"part_type_$i"} eq 'assembly') {
         $sameitem = "";
 
         # get parts and push them onto the stack
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 1c39a51e5..c799d0c38 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -479,7 +479,7 @@ sub display_row {
           $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
           map { ($cgi->hidden("-name" => $_, "-id" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
             (qw(bo price_old id inventory_accno bin partsgroup partnotes active_price_source active_discount_source
-                income_accno expense_accno listprice assembly taxaccounts ordnumber donumber transdate cusordnumber
+                income_accno expense_accno listprice part_type taxaccounts ordnumber donumber transdate cusordnumber
                 longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars)
     );
 
diff --git a/doc/changelog b/doc/changelog
index b3728f6e1..22899fae6 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -59,6 +59,7 @@ Administrative Änderungen
 
 Bugfixes:
 
+- Bugfix #320 Stücklistenpositionen werden nicht mehr ausgedruckt
 - Bugfix #305 Kein customerpicker im Formular Rechnung erfassen
 - Bugfix #304 Datumsformat wechselt willkürlich auf Datenbank Format "YYYY-MM-DD"
 - Bugfix #303 Zahlungserinnerung PDF anhängen in E-Mail funktioniert nicht mehr
-- 
2.20.1