setupPoints und setupDateFormat in ein partial Layout verschoben

[mfinanz.git] / bin / mozilla / oe.pl
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl

index 683801aaa3e1268b673ead58a6ac404960bb54e1..f73c437765486bceb761e5d8f01059ccb1b71a1e 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -477,7 +477,9 @@ sub form_footer {
    $TMPL_VAR{notes}    = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
    $TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
  
-  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
+  my $paymet_id = $::form->{payment_id};
+  IS->get_customer(\%myconfig, $::form) if $form->{type} =~ /sales_(order|quotation)/;
+  $::form->{payment_id} = $paymet_id;
  
    if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
      $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
@@ -779,6 +781,7 @@ sub orders {
    my @columns = (
      "transdate",               "reqdate",
      "id",                      $ordnumber,
+    "customernumber",
      "name",                    "netamount",
      "tax",                     "amount",
      "curr",                    "employee",
@@ -838,6 +841,7 @@ sub orders {
      'ordnumber'               => { 'text' => $locale->text('Order'), },
      'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
      'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
+    'customernumber'          => { 'text' => $locale->text('Customer Number'), },
      'netamount'               => { 'text' => $locale->text('Amount'), },
      'tax'                     => { 'text' => $locale->text('Tax'), },
      'amount'                  => { 'text' => $locale->text('Total'), },
@@ -1221,7 +1225,7 @@ sub save {
  
    $form->{simple_save} = 1;
    if(!$form->{print_and_save}) {
-    delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])};
+    delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
      edit();
      ::end_of_request();
    }
@@ -1455,8 +1459,6 @@ sub backorder_exchangerate {
    $form->header;
  
    print qq|
-<body>
-
  <form method=post action=$form->{script}>
  |;
  
@@ -1508,9 +1510,6 @@ sub backorder_exchangerate {
      . $locale->text('Continue') . qq|">
  
  </form>
-
-</body>
-</html>
  |;
  
    $main::lxdebug->leave_sub();