Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5e984449

Von Sven Schöling vor mehr als 16 Jahren hinzugefügt

  • ID 5e984449bf2da02189d95d332182ef9bbdbe0b84
  • Vorgänger 55ea1677
  • Nachfolger cd16e602

Bugfix:
Verkaeufer und Bearbeiter waren in den Rechnungsberichten durcheinandergekommen.
Sind jetzt getrennt und korrekt in den Berichten einzubinden.

Unterschiede anzeigen:

SL/AR.pm
416 416
    qq|  a.transaction_description, | .
417 417
    qq|  pr.projectnumber AS globalprojectnumber, | .
418 418
    qq|  c.name, | .
419
    qq|  e.name AS employee | .
419
    qq|  e.name AS employee, | .
420
    qq|  e2.name AS salesman | .
420 421
    qq|FROM ar a | .
421 422
    qq|JOIN customer c ON (a.customer_id = c.id) | .
422 423
    qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
424
    qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
423 425
    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)|;
424 426

  
425 427
  my $where = "1 = 1";
bin/mozilla/ar.pl
1377 1377
	      <tr>
1378 1378
		<td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
1379 1379
		<td nowrap>| . $locale->text('Notes') . qq|</td>
1380
		<td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
1380
		<td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
1381 1381
		<td nowrap>| . $locale->text('Salesperson') . qq|</td>
1382 1382
		<td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
1383 1383
		<td nowrap>| . $locale->text('Shipping Point') . qq|</td>
......
1385 1385
		<td nowrap>| . $locale->text('Ship via') . qq|</td>
1386 1386
	      </tr>
1387 1387
	      <tr>
1388
		<td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td><td> |
1389
    .             $locale->text('Ertrag') . qq|</td>
1390
		<td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td><td> |
1391
    .             $locale->text('Ertrag prozentual') . qq|</td>
1388
		<td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
1389
                <td nowrap> | . $locale->text('Ertrag') . qq|</td>
1390
		<td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
1391
                <td nowrap> | . $locale->text('Ertrag prozentual') . qq|</td>
1392
		<td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
1393
		<td nowrap>| . $locale->text('Employee') . qq|</td>
1392 1394
	      </tr>
1393 1395
	      <tr>
1394 1396
		<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
......
1465 1467

  
1466 1468
  @columns =
1467 1469
    qw(transdate id type invnumber ordnumber name netamount tax amount paid
1468
       datepaid due duedate transaction_description notes employee shippingpoint shipvia
1470
       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
1469 1471
       marge_total marge_percent globalprojectnumber);
1470 1472

  
1471 1473
  my @hidden_variables = map { "l_${_}" } @columns;
......
1489 1491
    'duedate'                 => { 'text' => $locale->text('Due Date'), },
1490 1492
    'transaction_description' => { 'text' => $locale->text('Transaction description'), },
1491 1493
    'notes'                   => { 'text' => $locale->text('Notes'), },
1492
    'employee'                => { 'text' => $locale->text('Salesperson'), },
1494
    'salesman'                => { 'text' => $locale->text('Salesperson'), },
1495
    'employee'                => { 'text' => $locale->text('Employee'), },
1493 1496
    'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
1494 1497
    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
1495 1498
    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
locale/de/ar
88 88
  'Dunning'                     => 'Mahnung',
89 89
  'ELSE'                        => 'Zusatz',
90 90
  'Edit Accounts Receivables Transaction' => 'Debitorenbuchung bearbeiten',
91
  'Employee'                    => 'Bearbeiter',
91 92
  'Enter longdescription'       => 'Langtext eingeben',
92 93
  'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
93 94
  'Ertrag'                      => 'Ertrag',

Auch abrufbar als: Unified diff