Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 6881b4bd

Von Thomas Heck vor etwa 12 Jahren hinzugefügt

  • ID 6881b4bd6a669dd991b227ecf41c3e8662806595
  • Vorgänger e7fb0b01
  • Nachfolger 09a8d687

Zahlungsbedingungen nicht unter Angebot/Auftrag überschreiben.

fixt #2015

Unterschiede anzeigen:

bin/mozilla/is.pl
407 407
  my ($tax, $subtotal);
408 408
  $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
409 409

  
410
  my $paymet_id = $::form->{payment_id};
410 411
  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
412
  $::form->{payment_id} = $paymet_id;
411 413

  
412 414
  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
413 415
    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
......
519 521
    map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
520 522
    if (!$form->{"forex_$i"}) {   #read exchangerate from input field (not hidden)
521 523
      $form->{exchangerate} = $form->{"exchangerate_$i"};
522
    } 
524
    }
523 525
    $form->{"forex_$i"}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
524 526
    $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
525 527
  }
bin/mozilla/oe.pl
477 477
  $TMPL_VAR{notes}    = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
478 478
  $TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
479 479

  
480
  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
480
  my $paymet_id = $::form->{payment_id};
481
  IS->get_customer(\%myconfig, $::form) if $form->{type} =~ /sales_(order|quotation)/;
482
  $::form->{payment_id} = $paymet_id;
481 483

  
482 484
  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
483 485
    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
......
779 781
  my @columns = (
780 782
    "transdate",               "reqdate",
781 783
    "id",                      $ordnumber,
782
    "customernumber", 
784
    "customernumber",
783 785
    "name",                    "netamount",
784 786
    "tax",                     "amount",
785 787
    "curr",                    "employee",

Auch abrufbar als: Unified diff