From: Bernd Blessmann <bibi@online.de>
Date: Tue, 10 Jan 2012 11:10:33 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~69^2~5^2~1
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/925da7fb961c7f344658542d97ae2a8b56e5e5f2?ds=inline;hp=-c

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

925da7fb961c7f344658542d97ae2a8b56e5e5f2
diff --combined bin/mozilla/io.pl
index 1e380cdba,7627da1cf..dbefff3be
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@@ -400,7 -400,7 +400,7 @@@ sub display_row 
  
      if ($is_delivery_order) {
        map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
 -      push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost);
 +      push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost pricegroup_id);
        push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
      }
  
@@@ -1517,7 -1517,6 +1517,6 @@@ sub print_form 
    delete $form->{OUT};
  
    if ($form->{media} eq 'printer') {
-     #$form->{OUT} = "| $form->{printer_command} &>/dev/null";
      $form->{OUT}      = $form->{printer_command};
      $form->{OUT_MODE} = '|-';
      $form->{printed} .= " $form->{formname}";
diff --combined bin/mozilla/oe.pl
index 139b6f9f4,29012eb94..dd1d8e2c7
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@@ -318,7 -318,7 +318,7 @@@ sub form_header 
    # openclosed checkboxes
    my @tmp;
    push @tmp, sprintf qq|<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" %s><label for="delivered">%s</label>|,
-                         $form->{"delivered"} ? "checked" : "",  $locale->text('Delivered') if $form->{"type"} =~ /_order$/;
+                         $form->{"delivered"} ? "checked" : "",  $locale->text('Delivery Order created') if $form->{"type"} =~ /_order$/;
    push @tmp, sprintf qq|<input name="closed" id="closed" type="checkbox" class="checkbox" value="1" %s><label for="closed">%s</label>|,
                          $form->{"closed"}    ? "checked" : "",  $locale->text('Closed')    if $form->{id};
    $TMPL_VAR{openclosed} = sprintf qq|<tr><td colspan=%d align=center>%s</td></tr>\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
@@@ -833,7 -833,7 +833,7 @@@ sub orders 
      'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
      'transaction_description' => { 'text' => $locale->text('Transaction description'), },
      'open'                    => { 'text' => $locale->text('Open'), },
-     'delivered'               => { 'text' => $locale->text('Delivered'), },
+     'delivered'               => { 'text' => $locale->text('Delivery Order created'), },
      'marge_total'             => { 'text' => $locale->text('Ertrag'), },
      'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
      'vcnumber'                => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
@@@ -879,7 -879,7 +879,7 @@@
    };
    push @options, $locale->text('Open')                                                                    if $form->{open};
    push @options, $locale->text('Closed')                                                                  if $form->{closed};
-   push @options, $locale->text('Delivered')                                                               if $form->{delivered};
+   push @options, $locale->text('Delivery Order created')                                                               if $form->{delivered};
    push @options, $locale->text('Not delivered')                                                           if $form->{notdelivered};
    push @options, $locale->text('Periodic invoices active')                                                if $form->{periodic_invoices_actibe};
  
@@@ -1849,9 -1849,6 +1849,9 @@@ sub delivery_order 
  
    map { $form->{$_} = $old_values{$_} if ($old_values{$_}) } keys %old_values;
  
 +  for my $i (1 .. $form->{rowcount}) {
 +    (my $dummy, $form->{"pricegroup_id_$i"}) = split /--/, $form->{"sellprice_pg_$i"};
 +  }
    update();
  
    $main::lxdebug->leave_sub();