From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 23 Jul 2009 10:45:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~342^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/e0201a3f8f11b3a32f76b0c89eebb475e4798eca?ds=sidebyside;hp=-c

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

e0201a3f8f11b3a32f76b0c89eebb475e4798eca
diff --combined SL/DO.pm
index e847f5e33,5f8ab5227..f2675d3e9
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@@ -41,6 -41,7 +41,7 @@@ use SL::Common
  use SL::CVar;
  use SL::DBUtils;
  use SL::RecordLinks;
+ use SL::IC;
  
  sub transactions {
    $main::lxdebug->enter_sub();
@@@ -108,8 -109,7 +109,8 @@@
      push @values, '%' . $form->{$item} . '%';
    }
  
 -  if (!($form->{open} && $form->{closed})) {
 +  if (($form->{open} || $form->{closed}) &&
 +      ($form->{open} ne $form->{closed})) {
      push @where, ($form->{open} ? "NOT " : "") . "COALESCE(dord.closed, FALSE)";
    }
  
@@@ -777,12 -777,17 +778,17 @@@ sub order_details 
  
    my $ic_cvar_configs = CVar->get_configs(module => 'IC');
  
+   $form->{TEMPLATE_ARRAYS} = { };
+   IC->prepare_parts_for_printing();
+ 
    my @arrays =
      qw(runningnumber number description longdescription qty unit
         partnotes serialnumber reqdate projectnumber
         si_runningnumber si_number si_description
         si_warehouse si_bin si_chargenumber si_qty si_unit);
  
+   map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @tax_arrays);
+ 
    push @arrays, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
  
    my $sameitem = "";