Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 83d48a07

Von Thomas Kasulke vor mehr als 17 Jahren hinzugefügt

  • ID 83d48a07af73da318458780e40814cf89579cb94
  • Vorgänger 0c128c20
  • Nachfolger f2d7c61f

Währungs-popup auf cgi umgestellt

Unterschiede anzeigen:

bin/mozilla/ir.pl
120 120
    $form->{taxzone_id} = $taxzone_id;
121 121
  }
122 122

  
123
  # currencies
124
  @curr = split(/:/, $form->{currencies});
125
  chomp $curr[0];
126
  $form->{defaultcurrency} = $curr[0];
127

  
128 123
  map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
129 124

  
130 125
  $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}";
......
279 274
                   "projects" => { "key" => "ALL_PROJECTS",
280 275
                                   "all" => 0,
281 276
                                   "old_id" => \@old_project_ids },
282
                   "taxzones" => "ALL_TAXZONES");
277
                   "taxzones" => "ALL_TAXZONES",
278
                   "currencies" => "ALL_CURRENCIES");
283 279

  
284 280
  my %labels;
285 281
  my @values = (undef);
......
302 298
    NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
303 299
                         '-labels' => \%labels,
304 300
                         '-default' => $form->{"globalproject_id"}));
305

  
301
 
302
  %labels = ();
303
  @values = ();
304
  foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) {
305
    push(@values, $item->{"currency"});
306
    $labels{$item->{"currency"}} = $item->{"currency"};
307
  }
308
  
309
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
310
  my $currencies = qq|
311
    <tr>
312
      <th align="right">| . $locale->text('Currency') . qq|</th>
313
      <td>| .
314
        NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
315
                             '-values' => \@values, '-labels' => \%labels)) . qq|
316
      </td>
317
    </tr>|;
318
  
306 319
  %labels = ();
307 320
  @values = ();
308 321
  foreach my $item (@{ $form->{"ALL_TAXZONES"} }) {
......
459 472
              $taxzone
460 473
              $department
461 474
	      <tr>
462
		<th align=right nowrap>| . $locale->text('Currency') . qq|</th>
463
		<td><select name=currency>$form->{selectcurrency}</select></td>
475
    $currencies
464 476
		$exchangerate
465 477
	      </tr>
466 478
	    </table>
......
507 519

  
508 520
$jsscript
509 521

  
510
<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
511
<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
512 522
<input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
513 523
<input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
514 524
<input type=hidden name=webdav value=$webdav>
bin/mozilla/is.pl
167 167
    $form->{shipto_id} = $shipto_id;
168 168
  }
169 169

  
170
  # currencies
171
  @curr = split(/:/, $form->{currencies});
172
  chomp $curr[0];
173
  $form->{defaultcurrency} = $curr[0];
174

  
175
  map { $form->{selectcurrency} .= "<option>$_</option>\n" } @curr;
176

  
177 170
  $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
178 171

  
179 172
  if (@{ $form->{all_customer} }) {
......
344 337
                                   "all" => 0,
345 338
                                   "old_id" => \@old_project_ids },
346 339
                   "employees" => "ALL_SALESMEN",
347
                   "taxzones" => "ALL_TAXZONES");
340
                   "taxzones" => "ALL_TAXZONES",
341
                   "currencies" => "ALL_CURRENCIES");
348 342

  
349 343
  my %labels;
350 344
  my @values = (undef);
......
372 366
                         '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
373 367
    . qq|</td>|;
374 368

  
369
  %labels = ();
370
  @values = ();
371
  foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) {
372
    push(@values, $item->{"currency"});
373
    $labels{$item->{"currency"}} = $item->{"currency"};
374
  }
375
  
376
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
377
  my $currencies = qq|
378
    <tr>
379
      <th align="right">| . $locale->text('Currency') . qq|</th>
380
      <td>| .
381
        NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
382
                             '-values' => \@values, '-labels' => \%labels)) . qq|
383
      </td>
384
    </tr>|;
385

  
375 386
  %labels = ();
376 387
  @values = ("");
377 388
  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
......
676 687
              $taxzone
677 688
	      $department
678 689
	      <tr>
679
		<th align="right" nowrap>| . $locale->text('Currency') . qq|</th>
680
		<td><select name="currency">$form->{selectcurrency}</select></td>
681
		<input type="hidden" name="selectcurrency" value="$form->{selectcurrency}">
682
		<input type="hidden" name="defaultcurrency" value="$form->{defaultcurrency}">
690
    $currencies
683 691
		<input type="hidden" name="fxgain_accno" value="$form->{fxgain_accno}">
684 692
		<input type="hidden" name="fxloss_accno" value="$form->{fxloss_accno}">
685 693
		$exchangerate
bin/mozilla/oe.pl
254 254
      (@{ $form->{"all_$form->{vc}"} });
255 255
  }
256 256

  
257
  # currencies
258
  @curr = split(/:/, $form->{currencies});
259
  chomp $curr[0];
260
  $form->{defaultcurrency} = $curr[0];
261
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
262

  
263
  map { $form->{selectcurrency} .= "<option>$_</option>\n" } @curr;
264

  
265 257
  $form->{taxincluded} = $taxincluded if ($form->{id});
266 258

  
267 259
  # departments
......
361 353

  
362 354
    # with JavaScript Calendar
363 355
    $button1 = qq|
364
       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} onBlur=\"check_right_date_format(this)\"></td>
356
       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>
365 357
       <td><input type=button name=transdate id="trigger1" value=|
366 358
      . $locale->text('button') . qq|></td>
367 359
      |;
368 360
    $button2 = qq|
369
       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate} onBlur=\"check_right_date_format(this)\"></td>
361
       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\"></td>
370 362
       <td width="4"><input type=button name=reqdate name=reqdate id="trigger2" value=|
371 363
      . $locale->text('button') . qq|></td>
372 364
     |;
......
380 372

  
381 373
    # without JavaScript Calendar
382 374
    $button1 = qq|
383
                              <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} onBlur=\"check_right_date_format(this)\"></td>|;
375
                              <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>|;
384 376
    $button2 = qq|
385
                              <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate} onBlur=\"check_right_date_format(this)\"></td>|;
377
                              <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\"></td>|;
386 378
  }
387 379

  
388 380
  my @tmp;
......
432 424
                                   "all" => 0,
433 425
                                   "old_id" => \@old_project_ids },
434 426
                   "employees" => "ALL_SALESMEN",
435
                   "taxzones" => "ALL_TAXZONES");
427
                   "taxzones" => "ALL_TAXZONES",
428
                   "currencies" => "ALL_CURRENCIES");
436 429

  
437 430
  my %labels;
438 431
  my @values = (undef);
......
507 500
      </td>
508 501
    </tr>|;
509 502

  
503
  %labels = ();
504
  @values = ();
505
  foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) {
506
    push(@values, $item->{"currency"});
507
    $labels{$item->{"currency"}} = $item->{"currency"};
508
  }
509
  
510
  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
511
  my $currencies = qq|
512
    <tr>
513
      <th align="right">| . $locale->text('Currency') . qq|</th>
514
      <td>| .
515
        NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
516
                             '-values' => \@values, '-labels' => \%labels)) . qq|
517
      </td>
518
    </tr>|;
519

  
520

  
510 521
  $form->{exchangerate} =
511 522
    $form->format_amount(\%myconfig, $form->{exchangerate});
512 523

  
......
792 803
              $taxzone
793 804
	      $department
794 805
	      <tr>
795
		<th align=right>| . $locale->text('Currency') . qq|</th>
796
		<td><select name=currency>$form->{selectcurrency}</select></td>
797
		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
798
		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
806
		$currencies
799 807
		$exchangerate
800 808
	      </tr>
801 809
	      <tr>

Auch abrufbar als: Unified diff