Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 47916a37

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID 47916a374217afc8d84bd147f0fada5086970bae
  • Vorgänger d7c969e4
  • Nachfolger d7f06042

Optik in den Einkaufs- und Verkaufsformularen etwas verbessert:
1. Drop-Down-Boxen "Ansprechpartner" und "Lieferadresse" werden direkt unterhalb der Kunden-/Lieferantenauswahlbox/-zeile angezeigt.
2. Die Zeile "Kreditlimit" wird wie alle anderen Zeilen auch in der linken Spalte (der "Beschreibungsspalte") angefangen und erstreckt sich nur über eine Zeile.
3. Die Zeile "höchste Mahnstufe" wird wie alle anderen Zeilen auch in der linken Spalte (der "Beschreibungsspalte") angefangen.
4. Die Drop-Down-Boxen für Ansprechpartner, Lieferadresse und Währungen werden nur angezeigt, wenn es dort auch etwas auszuwählen gibt.

Unterschiede anzeigen:

bin/mozilla/ir.pl
286 286
    $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
287 287
      ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
288 288
  }
289
  my $contact =
290
    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
291
                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
289

  
290
  my $contact;
291
  if (scalar @values > 1) {
292
    $contact = qq|
293
    <tr>
294
      <th align="right">| . $locale->text('Contact Person') . qq|</th>
295
      <td>| .
296
      NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
297
                           '-labels' => \%labels, '-default' => $form->{"cp_id"}))
298
      . qq|
299
      </td>
300
    </tr>|;
301
  }
292 302

  
293 303
  %labels = ();
294 304
  @values = ("");
......
309 319
    $labels{$item} = $item;
310 320
  }
311 321
  
312
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
313
  my $currencies = qq|
322
  $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
323
  my $currencies;
324
  if (scalar @values) {
325
    $currencies = qq|
314 326
    <tr>
315 327
      <th align="right">| . $locale->text('Currency') . qq|</th>
316 328
      <td>| .
......
318 330
                             '-values' => \@values, '-labels' => \%labels)) . qq|
319 331
      </td>
320 332
    </tr>|;
321
    
333
  }
334

  
322 335
  %labels = ();
323 336
  @values = ();
324 337
  my $i = 0;
......
396 409

  
397 410
    # with JavaScript Calendar
398 411
    $button1 = qq|
399
       <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
400
       <td><input type=button name=invdate id="trigger1" value=|
412
       <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
413
        <input type=button name=invdate id="trigger1" value=|
401 414
      . $locale->text('button') . qq|></td>
402 415
       |;
403 416
    $button2 = qq|
404
       <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}"  onBlur=\"check_right_date_format(this)\"></td>
405
       <td width="4"><input type=button name=duedate id="trigger2" value=|
417
       <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}"  onBlur=\"check_right_date_format(this)\">
418
        <input type=button name=duedate id="trigger2" value=|
406 419
      . $locale->text('button') . qq|></td></td>
407 420
     |;
408 421

  
......
454 467

  
455 468
| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
456 469

  
470
<div class="listtop" width="100%">$form->{title}</div>
471

  
457 472
<table width=100%>
458
  <tr class=listtop>
459
    <th class=listtop>$form->{title}</th>
460
  </tr>
461
  <tr height="5"></tr>
462 473
  <tr>
463
    <td>
464
      <table width=100%>
465
        <tr valign=top>
466
	  <td>
474
    <td valign="top">
467 475
	    <table>
468
	      <tr>
469
    $vendors
470
                <th align=richt nowrap>|
471
    . $locale->text('Contact Person') . qq|</th>
472
                <td colspan=3>$contact</td>
473

  
474
                <input type="hidden" name="vendor_id" value="$form->{vendor_id}">
475
		<input type="hidden" name="oldvendor" value="$form->{oldvendor}">
476
    <input type="hidden" name="selectvendor" value= "1">
477
	      </tr>
478
	      <tr>
479
	        <td></td>
480
		<td>
481
		  <table>
482
		    <tr>
483
		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
484
		      <td>$form->{creditlimit}</td>
485
		      <td width=20%></td>
486
		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
487
		      <td class="plus$n">$form->{creditremaining}</td>
488
		    </tr>
489
		  </table>
490
		</td>  
476
        $vendors
477
        <input type="hidden" name="vendor_id" value="$form->{vendor_id}">
478
        <input type="hidden" name="oldvendor" value="$form->{oldvendor}">
479
        <input type="hidden" name="selectvendor" value= "1">
480
        $contact
481
        <tr>
482
          <td align="right">| . $locale->text('Credit Limit') . qq|</td>
483
          <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
484
        </tr>
491 485
	      <tr>
492 486
		<th align="right">| . $locale->text('Record in') . qq|</th>
493 487
		<td colspan="3"><select name="AP">$form->{selectAP}</select></td>
......
523 517
	      </tr>
524 518
        <tr>
525 519
          <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
526
          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
527
          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
520
          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\">
521
           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
528 522
        </tr>
529 523
        <tr>
530 524
          <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
531
          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
532
          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
525
          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\">
526
           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
533 527
        </tr>
534 528
	      <tr>
535 529
          <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
bin/mozilla/is.pl
340 340
    $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
341 341
      ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
342 342
  }
343
  my $contact =
344
    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
345
                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
343
  my $contact;
344
  if (scalar @values > 1) {
345
    $contact = qq|
346
    <tr>
347
      <th align="right">| . $locale->text('Contact Person') . qq|</th>
348
      <td>| .
349
      NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
350
                           '-labels' => \%labels, '-default' => $form->{"cp_id"}))
351
      . qq|
352
      </td>
353
    </tr>|;
354
  }
346 355

  
347 356
  %labels = ();
348 357
  @values = ();
......
386 395
      $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
387 396
  }
388 397

  
389
  my $shipto = qq|
390
		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
391
		<td>| .
392
    NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
393
                         '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
398
  my $shipto;
399
  if (scalar @values > 1) {
400
    $shipto = qq|
401
    <tr>
402
      <th align="right">| . $locale->text('Shipping Address') . qq|</th>
403
      <td>| .
404
      NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
405
                           '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
394 406
    . qq|</td>|;
407
  }
395 408

  
396 409
  %labels = ();
397 410
  @values = ();
......
401 414
  }
402 415
  
403 416
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
404
  my $currencies = qq|
417
  my $currencies;
418
  if (scalar @values) {
419
    $currencies = qq|
405 420
    <tr>
406 421
      <th align="right">| . $locale->text('Currency') . qq|</th>
407 422
      <td>| .
......
409 424
                             '-values' => \@values, '-labels' => \%labels)) . qq|
410 425
      </td>
411 426
    </tr>|;
427
  }
412 428

  
413 429
  %labels = ();
414 430
  @values = ("");
......
536 552

  
537 553
  if ($form->{max_dunning_level}) {
538 554
    $dunning = qq|
539
	      <tr>
540
                <td colspan="4">
541
                <table>
542
                  <tr>
543
		<th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
544
		<td><b>$form->{max_dunning_level}</b></td>
545
		<th align="right">| . $locale->text('Dunning Amount') . qq|:</th>
546
		<td><b>|
547
      . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
548
      . qq|</b></td>
549
	      </tr>
550
              </table>
551
             </td>
552
            </tr>
555
      <tr>
556
        <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
557
        <td>
558
          <b>$form->{max_dunning_level}</b>;
559
          | . $locale->text('Dunning Amount') . qq|: <b>|
560
        . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
561
        . qq|</b>
562
        </td>
563
      </tr>
553 564
|;
554 565
  }
555 566

  
......
563 574
  
564 575
      # with JavaScript Calendar
565 576
      $button1 = qq|
566
        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
567
        <td><input type="button" name="invdate" id="trigger1" value="|
577
        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
578
         <input type="button" name="invdate" id="trigger1" value="|
568 579
        . $locale->text('button') . qq|"></td>|;
569 580
       
570 581
      #write Trigger
......
585 596
  
586 597
      # with JavaScript Calendar
587 598
      $button1 = qq|
588
        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
589
        <td><input type="button" name="invdate" id="trigger1" value="|
599
        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
600
         <input type="button" name="invdate" id="trigger1" value="|
590 601
        . $locale->text('button') . qq|"></td>
591 602
        |;
592 603
      $button2 = qq|
593
        <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>
594
        <td width="4"><input type="button" name="duedate" id="trigger2" value="|
604
        <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\">
605
         <input type="button" name="duedate" id="trigger2" value="|
595 606
        . $locale->text('button') . qq|"></td></td>
596 607
      |;
597 608
      $button3 = qq|
598
        <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\"></td>
599
        <td width="4"><input type="button" name="deliverydate" id="trigger3" value="|
609
        <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\">
610
         <input type="button" name="deliverydate" id="trigger3" value="|
600 611
        . $locale->text('button') . qq|"></td></td>
601 612
      |;
602 613
  
......
660 671

  
661 672
<input type="hidden" name="lizenzen" value="$lizenzen">
662 673

  
674
<div class="listtop" width="100%">$form->{title}</div>
675

  
663 676
<table width="100%">
664
  <tr class="listtop">
665
    <th class="listtop">$form->{title}</th>
666
  </tr>
667
  <tr height="5"></tr>
668 677
  <tr>
669
    <td>
670
      <table width="100%">
671
	<tr valign="top">
672
	  <td>
673
	    <table>
674
	      <tr>
675
		$customers
676
    <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
677
		<input type="hidden" name="customer_id" value="$form->{customer_id}">
678
    <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
679
        <input type="hidden" name="selectcustomer" value="1">
680
                <th align="right" nowrap>|
681
    . $locale->text('Contact Person') . qq|</th>
682
                <td colspan="3">$contact</td>
683
	      </tr>
684
	      <tr>
685
		<td></td>
686
		<td colspan="3">
687
		  <table>
688
		    <tr>
689
		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
690
		      <td>$form->{creditlimit}</td>
691
		      <td width="20%"></td>
692
		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
693
		      <td class="plus$n">$form->{creditremaining}</td>
694
		    </tr>
695
		  </table>
696
		</td>
697
                $shipto
698
	      </tr>
699
	      $business
700
              $dunning
678
    <td valign="top">
679
      <table>
680
        <tr>
681
          $customers
682
          <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
683
          <input type="hidden" name="customer_id" value="$form->{customer_id}">
684
          <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
685
          <input type="hidden" name="selectcustomer" value="1">
686
        </tr>
687
        $contact
688
        $shipto
689
        <tr>
690
          <td align="right">| . $locale->text('Credit Limit') . qq|</td>
691
          <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
692
        </tr>
693
        $dunning
694
        $business
701 695
	      <tr>
702 696
		<th align="right" nowrap>| . $locale->text('Record in') . qq|</th>
703 697
		<td colspan="3"><select name="AR" style="width:280px;">$form->{selectAR}</select></td>
......
746 740
#               </tr>
747 741
print qq|	    </table>
748 742
	  </td>
749
	  <td align="right">
743
	  <td align="right" valign="top">
750 744
	    <table>
751 745
	      $employees
752 746
        $salesman
......
784 778
	      </tr>
785 779
        <tr>
786 780
          <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
787
          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
788
          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
781
          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\">
782
           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
789 783
        </tr>
790 784
	      <tr>
791 785
		<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
......
793 787
	      </tr>
794 788
        <tr>
795 789
          <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
796
          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
797
          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
790
          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\">
791
           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
798 792
        </tr>
799 793
	      <tr>
800 794
		<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
bin/mozilla/oe.pl
338 338

  
339 339
    # with JavaScript Calendar
340 340
    $button1 = qq|
341
       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>
342
       <td><input type=button name=transdate id="trigger1" value=|
341
       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\">
342
        <input type=button name=transdate id="trigger1" value=|
343 343
      . $locale->text('button') . qq|></td>
344 344
      |;
345 345
    $button2 = qq|
346
       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\"></td>
347
       <td width="4"><input type=button name=reqdate name=reqdate id="trigger2" value=|
346
       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\">
347
        <input type=button name=reqdate name=reqdate id="trigger2" value=|
348 348
      . $locale->text('button') . qq|></td>
349 349
     |;
350 350

  
......
422 422
    $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
423 423
      ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
424 424
  }
425
  my $contact =
426
    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
427
                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
425

  
426
  my $contact;
427
  if (scalar @values > 1) {
428
    $contact = qq|
429
    <tr>
430
      <th align="right">| . $locale->text('Contact Person') . qq|</th>
431
      <td>| .
432
      NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
433
                           '-labels' => \%labels, '-default' => $form->{"cp_id"}))
434
      . qq|
435
      </td>
436
    </tr>|;
437
  }
428 438

  
429 439
  %labels = ();
430 440
  @values = ();
......
469 479
      $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
470 480
  }
471 481

  
472
  my $shipto = qq|
473
		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
474
		<td>| .
475
    NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
476
                         '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
482
  my $shipto;
483
  if (scalar @values > 1) {
484
    $shipto = qq|
485
    <tr>
486
      <th align="right">| . $locale->text('Shipping Address') . qq|</th>
487
      <td>| .
488
      NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
489
                           '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
477 490
    . qq|</td>|;
491
  }
478 492

  
479 493
  %labels = ();
480 494
  @values = ("");
......
545 559
    push(@values, $item);
546 560
    $labels{$item} = $item;
547 561
  }
548
  
549
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
550
  my $currencies = qq|
562

  
563
  $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
564
  my $currencies;
565
  if (scalar @values) {
566
    $currencies = qq|
551 567
    <tr>
552 568
      <th align="right">| . $locale->text('Currency') . qq|</th>
553 569
      <td>| .
......
555 571
                             '-values' => \@values, '-labels' => \%labels)) . qq|
556 572
      </td>
557 573
    </tr>|;
558

  
574
  }
559 575

  
560 576
  $form->{exchangerate} =
561 577
    $form->format_amount(\%myconfig, $form->{exchangerate});
......
801 817
	    <table width=100%>
802 818
	      <tr>
803 819
        $vc
804
                <th align=richt nowrap>|
805
    . $locale->text('Contact Person') . qq|</th>
806
                <td colspan=3>$contact</td>
807
	      </tr>
820
        $contact
808 821
	      $creditremaining
809 822
	      $business
810 823
              $dunning

Auch abrufbar als: Unified diff