X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FOE.pm;h=739d8a017c0ffdf441ed56de201cdd02aeba1106;hb=5b2980ad49f1937786d25f10fa9dac43cf255eb0;hp=6f7f9fc2a1bce9c32a7ee2a6a0c82d78e72f8592;hpb=ef220490853ca3b41b4b67568af4bf6b6dc5cc30;p=kivitendo-erp.git

diff --git a/SL/OE.pm b/SL/OE.pm
index 6f7f9fc2a..739d8a017 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -73,7 +73,8 @@ sub transactions {
     qq|  o.marge_total, o.marge_percent, | .
     qq|  ex.$rate AS exchangerate, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
-    qq|  e.name AS employee, s.name AS salesman | .
+    qq|  e.name AS employee, s.name AS salesman, | .
+    qq|  ct.country, ct.ustid  | .
     qq|FROM oe o | .
     qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
     qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
@@ -820,7 +821,6 @@ sub retrieve {
                                              sub_module => 'orderitems',
                                              trans_id   => $ref->{orderitems_id},
                                             );
-      # $main::lxdebug->dump(0, "cv", $cvars);
       map { $ref->{"ic_cvar_$_->{name}"} = $_->{value} } @{ $cvars };
 
       # Handle accounts.
@@ -996,6 +996,7 @@ sub order_details {
 
   $form->{discount} = [];
 
+  $form->{TEMPLATE_ARRAYS} = { };
   IC->prepare_parts_for_printing();
 
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
@@ -1011,7 +1012,7 @@ sub order_details {
 
   my @tax_arrays = qw(taxbase tax taxdescription taxrate taxnumber);
 
-  $form->{TEMPLATE_ARRAYS} = { map { $_ => [] } (@arrays, @tax_arrays) };
+  map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @tax_arrays);
 
   my $sameitem = "";
   foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {