Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b65a230d

Von Sven Schöling vor fast 15 Jahren hinzugefügt

  • ID b65a230d60e86d2c18a3ab7222379905aea5ecd7
  • Vorgänger 3cbc223a
  • Nachfolger 7e9a98a0

Tabs aus *.pl Dateien entfernt.

Unterschiede anzeigen:

bin/mozilla/ar.pl
91 91
  # saving the history
92 92
  if(!exists $form->{addition} && ($form->{id} ne "")) {
93 93
    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
94
  	$form->{addition} = "ADDED";
95
  	$form->save_history($form->dbconnect(\%myconfig));
94
    $form->{addition} = "ADDED";
95
    $form->save_history($form->dbconnect(\%myconfig));
96 96
  }
97 97
  # /saving the history
98 98

  
......
293 293
  if ($form->{currency} ne $form->{defaultcurrency}) {
294 294
    if ($form->{forex}) {
295 295
      $exchangerate .= qq|
296
	<th align=right>| . $locale->text('Exchangerate') . qq|</th>
297
	<td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
296
        <th align=right>| . $locale->text('Exchangerate') . qq|</th>
297
        <td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
298 298
|;
299 299
    } else {
300 300
      $exchangerate .= qq|
......
305 305
  }
306 306

  
307 307
  $taxincluded = qq|
308
	      <tr>
309
		<td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
310
		<th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
311
	      </tr>
308
              <tr>
309
                <td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
310
                <th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
311
              </tr>
312 312
|;
313 313

  
314 314
  if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
......
318 318
    qq|<textarea name=notes rows=$rows cols=50 wrap=soft>$form->{notes}</textarea>|;
319 319

  
320 320
  $department = qq|
321
	      <tr>
322
		<th align="right" nowrap>| . $locale->text('Department') . qq|</th>
323
		<td colspan=3><select name=department>$form->{selectdepartment}</select>
324
		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
325
		</td>
326
	      </tr>
321
              <tr>
322
                <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
323
                <td colspan=3><select name=department>$form->{selectdepartment}</select>
324
                <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
325
                </td>
326
              </tr>
327 327
| if $form->{selectdepartment};
328 328

  
329 329
  my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
......
338 338

  
339 339
  if ($form->{selectemployee}) {
340 340
    $employee = qq|
341
	      <tr>
342
		<th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
343
		<td  colspan=2><select name=employee>$form->{selectemployee}</select></td>
344
		<input type=hidden name=selectemployee value="$form->{selectemployee}">
345
	      </tr>
341
              <tr>
342
                <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
343
                <td  colspan=2><select name=employee>$form->{selectemployee}</select></td>
344
                <input type=hidden name=selectemployee value="$form->{selectemployee}">
345
              </tr>
346 346
|;
347 347
  }
348 348

  
......
478 478
    <td>
479 479
      <table width=100%>
480 480
        <tr valign=top>
481
	  <td>
482
	    <table>
483
	      <tr>
484
		<th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
485
		<td colspan=3>$customer <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')"></td>
486
		<input type=hidden name=selectcustomer value="$form->{selectcustomer}">
487
		<input type=hidden name=oldcustomer value="$form->{oldcustomer}">
488
		<input type=hidden name=customer_id value="$form->{customer_id}">
489
		<input type=hidden name=terms value=$form->{terms}>
490
	      </tr>
491
	      <tr>
492
		<td></td>
493
		<td colspan=3>
494
		  <table width=100%>
495
		    <tr>
496
		      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
497
		      <td>$form->{creditlimit}</td>
498
		      <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
499
		      <td class="plus$n">$form->{creditremaining}</td>
500
		      <input type=hidden name=creditlimit value=$form->{creditlimit}>
501
		      <input type=hidden name=creditremaining value=$form->{creditremaining}>
502
		    </tr>
503
		  </table>
504
		</td>
505
	      </tr>
506
	      <tr>
507
		<th align=right>| . $locale->text('Currency') . qq|</th>
508
		<td><select name=currency>$form->{selectcurrency}</select></td>
509
		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
510
		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
511
		<input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
512
		<input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
513
		$exchangerate
514
	      </tr>
515
	      $department
516
	      $taxincluded
517
	    </table>
518
	  </td>
519
	  <td align=right>
520
	    <table>
521
	      $employee
522
	      <tr>
523
		<th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
524
		<td><input name=invnumber size=11 value="$form->{invnumber}"></td>
525
	      </tr>
526
	      <tr>
527
		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
528
		<td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
529
	      </tr>
530
	      <tr>
531
		<th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
481
          <td>
482
            <table>
483
              <tr>
484
                <th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
485
                <td colspan=3>$customer <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')"></td>
486
                <input type=hidden name=selectcustomer value="$form->{selectcustomer}">
487
                <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
488
                <input type=hidden name=customer_id value="$form->{customer_id}">
489
                <input type=hidden name=terms value=$form->{terms}>
490
              </tr>
491
              <tr>
492
                <td></td>
493
                <td colspan=3>
494
                  <table width=100%>
495
                    <tr>
496
                      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
497
                      <td>$form->{creditlimit}</td>
498
                      <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
499
                      <td class="plus$n">$form->{creditremaining}</td>
500
                      <input type=hidden name=creditlimit value=$form->{creditlimit}>
501
                      <input type=hidden name=creditremaining value=$form->{creditremaining}>
502
                    </tr>
503
                  </table>
504
                </td>
505
              </tr>
506
              <tr>
507
                <th align=right>| . $locale->text('Currency') . qq|</th>
508
                <td><select name=currency>$form->{selectcurrency}</select></td>
509
                <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
510
                <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
511
                <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
512
                <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
513
                $exchangerate
514
              </tr>
515
              $department
516
              $taxincluded
517
            </table>
518
          </td>
519
          <td align=right>
520
            <table>
521
              $employee
522
              <tr>
523
                <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
524
                <td><input name=invnumber size=11 value="$form->{invnumber}"></td>
525
              </tr>
526
              <tr>
527
                <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
528
                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
529
              </tr>
530
              <tr>
531
                <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
532 532
                $button1
533
	      </tr>
534
	      <tr>
535
		<th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
533
              </tr>
534
              <tr>
535
                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
536 536
                $button2
537
	      </tr>
537
              </tr>
538 538
     </table>
539
	  </td>
540
	</tr>
539
          </td>
540
        </tr>
541 541
      </table>
542 542
    </td>
543 543
  </tr>
......
547 547
  <tr>
548 548
      <td>
549 549
          <table width=100%>
550
	   <tr class=listheading>
551
	  <th class=listheading style="width:15%">|
550
           <tr class=listheading>
551
          <th class=listheading style="width:15%">|
552 552
    . $locale->text('Account') . qq|</th>
553
	  <th class=listheading style="width:10%">|
553
          <th class=listheading style="width:10%">|
554 554
    . $locale->text('Amount') . qq|</th>
555 555
          <th class=listheading style="width:10%">|
556 556
    . $locale->text('Tax') . qq|</th>
......
558 558
    . $locale->text('Taxkey') . qq|</th>
559 559
          <th class=listheading style="width:10%">|
560 560
    . $locale->text('Project') . qq|</th>
561
	</tr>
561
        </tr>
562 562
|;
563 563

  
564 564
  $amount  = $locale->text('Amount');
......
622 622
                           '-default' => $form->{"project_id_$i"} ));
623 623

  
624 624
    print qq|
625
	<tr>
625
        <tr>
626 626
          <td>$selectAR_amount</td>
627 627
          <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
628 628
          <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
629 629
          $tax
630 630
          <td>$projectnumber</td>
631
	</tr>
631
        </tr>
632 632
|;
633 633
    $amount  = "";
634 634
    $project = "";
......
650 650
          </td>
651 651
        </tr>
652 652
        <tr>
653
	  <td>${ARselected}</td>
654
	  <th align=left>$form->{invtotal}</th>
653
          <td>${ARselected}</td>
654
          <th align=left>$form->{invtotal}</th>
655 655

  
656
	  <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
657
	  <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
656
          <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
657
          <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
658 658

  
659
	  <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
659
          <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
660 660

  
661
	  <td colspan=4></td>
661
          <td colspan=4></td>
662 662

  
663 663

  
664 664
        </tr>
......
669 669
      <td>
670 670
        <table width=100%>
671 671
        <tr>
672
	  <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
673
	  <td align=left>$notes</td>
674
	</tr>
672
          <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
673
          <td align=left>$notes</td>
674
        </tr>
675 675
      </table>
676 676
    </td>
677 677
  </tr>
678 678
  <tr>
679 679
    <td>
680 680
      <table width=100%>
681
	<tr class=listheading>
682
	  <th colspan=7 class=listheading>|
681
        <tr class=listheading>
682
          <th colspan=7 class=listheading>|
683 683
    . $locale->text('Incoming Payments') . qq|</th>
684
	</tr>
684
        </tr>
685 685
|;
686 686

  
687 687
  if ($form->{currency} eq $form->{defaultcurrency}) {
......
1159 1159
  # saving the history
1160 1160
  if(!exists $form->{addition} && $form->{id} ne "") {
1161 1161
    $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
1162
  	$form->{addition} = "POSTED AS NEW";
1163
  	$form->save_history($form->dbconnect(\%myconfig));
1162
    $form->{addition} = "POSTED AS NEW";
1163
    $form->save_history($form->dbconnect(\%myconfig));
1164 1164
  }
1165 1165
  # /saving the history
1166 1166
  &post;
......
1242 1242
    # saving the history
1243 1243
    if(!exists $form->{addition}) {
1244 1244
      $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
1245
  	  $form->{addition} = "DELETED";
1246
  	  $form->save_history($form->dbconnect(\%myconfig));
1245
      $form->{addition} = "DELETED";
1246
      $form->save_history($form->dbconnect(\%myconfig));
1247 1247
    }
1248 1248
    # /saving the history
1249 1249
    $form->redirect($locale->text('Transaction deleted!'));

Auch abrufbar als: Unified diff