Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d2482a05

Von Hans Peter Schlaepfer vor mehr als 5 Jahren hinzugefügt

  • ID d2482a05eb12a3cc7b79c5436d3453d0bb670712
  • Vorgänger 5cdf5329
  • Nachfolger f7df215b

Neues kivitendo Design Aenderungen in bin/mozilla/..

Unterschiede anzeigen:

bin/mozilla/oe.pl
330 330
        t8('Update'),
331 331
        submit    => [ '#form', { action => "update" } ],
332 332
        id        => 'update_button',
333
        checks   => [ 'kivi.validate_form' ],
333
        class     => 'inline',
334
        checks    => [ 'kivi.validate_form' ],
334 335
        accesskey => 'enter',
335 336
      ],
336 337

  
......
515 516
                        $form->{"delivered"} ? "checked" : "",  $locale->text('Delivery Order(s) for full qty created') if $form->{"type"} =~ /_order$/;
516 517
  push @tmp, sprintf qq|<input name="closed" id="closed" type="checkbox" class="checkbox" value="1" %s><label for="closed">%s</label>|,
517 518
                        $form->{"closed"}    ? "checked" : "",  $locale->text('Closed')    if $form->{id};
518
  $TMPL_VAR->{openclosed} = sprintf qq|<tr><td colspan=%d align=center>%s</td></tr>\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
519
  $TMPL_VAR->{openclosed} = sprintf qq|<tr><th colspan=%d><div class="list">%s</div></th></tr>\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
519 520

  
520 521
  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
521 522

  
......
661 662
    $TMPL_VAR->{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load;
662 663
  }
663 664

  
665
  # following 4 lines came from form_footer, comments/notes are now in upper part of the page
666
  my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8);
667

  
668
  my $TMPL_VAR = $::request->cache('tmpl_var', {});
669

  
670
  $TMPL_VAR->{notes}    = qq|<textarea name="notes" class="texteditor" wrap="soft" style="width: 300px; height: 150px">| . H($form->{notes}) . qq|</textarea>|;
671
  $TMPL_VAR->{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
672

  
673
  $TMPL_VAR->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); # moved from sub form_footer
674

  
675

  
676

  
664 677
  print $form->parse_html_template("oe/form_header", {
665 678
    %$TMPL_VAR,
666 679
    %type_check_vars,
......
680 693

  
681 694
  $form->{invtotal} = $form->{invsubtotal};
682 695

  
683
  my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8);
696
  #my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8);
684 697

  
685 698
  my $TMPL_VAR = $::request->cache('tmpl_var', {});
686 699

  
687
  $TMPL_VAR->{notes}    = qq|<textarea name="notes" class="texteditor" wrap="soft" style="width: 350px; height: 150px">| . H($form->{notes}) . qq|</textarea>|;
688
  $TMPL_VAR->{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
700
  #$TMPL_VAR->{notes}    = qq|<textarea name="notes" class="texteditor" wrap="soft" style="width: 350px; height: 150px">| . H($form->{notes}) . qq|</textarea>|;
701
  #$TMPL_VAR->{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
689 702

  
690 703
  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
691 704
    my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
......
1187 1200
  };
1188 1201
  push @options, $locale->text('Open')                                                                    if $form->{open};
1189 1202
  push @options, $locale->text('Closed')                                                                  if $form->{closed};
1190
  push @options, $locale->text('Delivery Order created')                                                               if $form->{delivered};
1203
  push @options, $locale->text('Delivery Order created')                                                  if $form->{delivered};
1191 1204
  push @options, $locale->text('Not delivered')                                                           if $form->{notdelivered};
1192 1205
  push @options, $locale->text('Periodic invoices active')                                                if $form->{periodic_invoices_active};
1193 1206
  push @options, $locale->text('Reqdate not set or before current month')                                 if $form->{reqdate_unset_or_old};

Auch abrufbar als: Unified diff