From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 28 Dec 2010 14:06:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~53^2~2^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/27557af4df09feccf6cb4e40b06af01102d029b1?ds=inline;hp=-c

Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
---

27557af4df09feccf6cb4e40b06af01102d029b1
diff --combined bin/mozilla/is.pl
index a94a720f2,f83560334..b38cfd1d5
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@@ -266,6 -266,8 +266,8 @@@ sub prepare_invoice 
  
        $form->{"qty_$i"}        = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
  
+       $form->{"sellprice_pg_$i"} = join ('--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"});
+ 
        $form->{rowcount}        = $i;
  
      }
@@@ -423,17 -425,9 +425,17 @@@ sub form_footer 
    $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
    $form->{paid_indices} = [ 1 .. $form->{paidaccounts} ];
  
 +  # Standard Konto für Umlaufvermögen
 +  my $accno_arap = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
 +
    for my $i (1 .. $form->{paidaccounts}) {
      $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
 -    $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
 +    if (!$form->{"AR_paid_$i"}) {
 +      $form->{"selectAR_paid_$i"} =~ s/option>$accno_arap--(.*?)</option selected>$accno_arap--$1</;
 +    } else {
 +      $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
 +    }
 +
      $totalpaid += $form->{"paid_$i"};
    }