Layout package names refactored

[mfinanz.git] / SL / OE.pm

diff --git a/SL/OE.pm b/SL/OE.pm
index 07758a84d18bfb74d20ab7e1133d092991038fb7..6648e22428b36433bc7ff2b4989811a993f0ae00 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -78,7 +78,7 @@ sub transactions {
 
   $query =
     qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
 
   $query =
     qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .

-    qq|  o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
+    qq|  o.amount, ct.${vc}number, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .

     qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
     qq|  o.transaction_description, | .
     qq|  o.marge_total, o.marge_percent, | .
     qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
     qq|  o.transaction_description, | .
     qq|  o.marge_total, o.marge_percent, | .


@@ -1218,8 +1218,7 @@ sub order_details {
         $subtotal_header     = 0;
 
       } else {
         $subtotal_header     = 0;
 
       } else {

-        push @{ $form->{TEMPLATE_ARRAYS}->{discount_sub} },   "";
-        push @{ $form->{TEMPLATE_ARRAYS}->{nodiscount_sub} }, "";
+        push @{ $form->{TEMPLATE_ARRAYS}->{$_} }, "" for qw(discount_sub nodiscount_sub discount_sub_nofmt nodiscount_sub_nofmt);

       }
 
       if (!$form->{"discount_$i"}) {
       }
 
       if (!$form->{"discount_$i"}) {