From: G. Richardson <information@lx-office-hosting.de>
Date: Wed, 29 Feb 2012 09:34:05 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~348
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/46b00bb49d5514f00c8ebf70c19b0e929b6a5a9b?ds=sidebyside;hp=-c

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

46b00bb49d5514f00c8ebf70c19b0e929b6a5a9b
diff --combined bin/mozilla/is.pl
index 5aa916eee,d99d1eb37..66aa4b8f2
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@@ -312,7 -312,7 +312,7 @@@ sub form_header 
    $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
    $TMPL_VAR{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
    $TMPL_VAR{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all(query => [
-     or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, shipto_id => $::form->{shipto_id} * 1 ]
+     or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
    ]);
    $TMPL_VAR{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all(query => [
      or => [
@@@ -576,7 -576,7 +576,7 @@@ sub update 
  
          $form->{creditremaining} -= $amount;
  
 -        map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice lastcost);
 +        map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice lastcost);
  
          $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
  
@@@ -938,12 -938,6 +938,12 @@@ sub credit_note 
  #  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
  #    qw(creditlimit creditremaining);
  
 +  for my $i (1 .. $form->{rowcount}) {
 +    for (qw(listprice)) {
 +      $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"};
 +    }
 +  }
 +
    my $currency = $form->{currency};
    &invoice_links;