Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ce3ce404

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID ce3ce404919a3e39c4b966db7b7d02076cd8c7e5
  • Vorgänger 81b82d22
  • Nachfolger 322b14b7

Bei Kundenangeboten, Kundenaufträgen, Lieferantenbestellungen und Lieferantenanfragen ein Feld "Vorgangsbezeichnung" implementiert.

Unterschiede anzeigen:

bin/mozilla/oe.pl
814 814
	      <tr>
815 815
		<th align=right>| . $locale->text('Ship via') . qq|</th>
816 816
		<td colspan=3><input name=shipvia size=35 value="$form->{shipvia}"></td>
817
	      </tr>|;
817
	      </tr>
818
              <tr>
819
                <th align="right">| . $locale->text('Transaction description') . qq|</th>
820
                <td colspan="3"><input name="transaction_description" size="35" value="| . H($form->{transaction_description}) . qq|"></td>
821
              </tr>|;
818 822
#              <tr>
819 823
#                 <td colspan=4>
820 824
#                   <table>
......
1461 1465
          <th align=right>$ordlabel</th>
1462 1466
          <td colspan=3><input name="$ordnumber" size=20></td>
1463 1467
        </tr>
1468
        <tr>
1469
          <th align="right">| . $locale->text('Transaction description') . qq|</th>
1470
          <td colspan="3"><input name="transaction_description" size=20></td>
1471
        </tr>
1464 1472
        <tr>
1465 1473
          <th align="right">| . $locale->text("Project Number") . qq|</th>
1466 1474
          <td colspan="3">$projectnumber</td>
......
1506 1514
    . $locale->text('Tax') . qq|</td>
1507 1515
		<td><input name="l_amount" class=checkbox type=checkbox value=Y checked> |
1508 1516
    . $locale->text('Total') . qq|</td>
1517
	      </tr>
1518
	      <tr>
1509 1519
          <td><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y> |
1510 1520
          . $locale->text('Project Number') . qq|</td>
1521
          <td><input name="l_transaction_description" class=checkbox type=checkbox value=Y> |
1522
          . $locale->text('Transaction description') . qq|</td>
1511 1523
	      </tr>
1512 1524
	      <tr>
1513 1525
	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y> |
......
1553 1565

  
1554 1566
  $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber";
1555 1567

  
1556
  $number     = $form->escape($form->{$ordnumber});
1557
  $name       = $form->escape($form->{ $form->{vc} });
1558
  $department = $form->escape($form->{department});
1559

  
1560 1568
  # construct href
1561
  $href =
1562
    "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
1563

  
1564
  # construct callback
1565
  $number     = $form->escape($form->{$ordnumber},    1);
1566
  $name       = $form->escape($form->{ $form->{vc} }, 1);
1567
  $department = $form->escape($form->{department},    1);
1568

  
1569
  $callback =
1570
    "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
1571

  
1572
  @columns =
1573
    $form->sort_columns("transdate", "reqdate",   "id",      "$ordnumber",
1574
                        "name",      "netamount", "tax",     "amount",
1575
                        "curr",      "employee",  "shipvia", "globalprojectnumber",
1576
                        "open",      "closed",    "delivered");
1569
  my @fields =
1570
    qw(type vc login password transdatefrom transdateto
1571
       open closed notdelivered delivered department
1572
       transaction_description);
1573
  $href = "$form->{script}?action=orders&"
1574
    . join("&", map { "${_}=" . E($form->{$_}) } @fields)
1575
    . "&${ordnumber}=" . E($form->{$ordnumber});
1576
  $callback = $href;
1577

  
1578
  @columns = (
1579
    "transdate",               "reqdate",
1580
    "id",                      "$ordnumber",
1581
    "name",                    "netamount",
1582
    "tax",                     "amount",
1583
    "curr",                    "employee",
1584
    "shipvia",                 "globalprojectnumber",
1585
    "transaction_description", "open",
1586
    "closed",                  "delivered"
1587
  );
1577 1588

  
1578 1589
  $form->{l_open} = $form->{l_closed} = "Y"
1579 1590
    if ($form->{open} && $form->{closed});
......
1667 1678

  
1668 1679
  $column_header{employee} =
1669 1680
    qq|<th><a class=listheading href=$href&sort=employee>$employee</a></th>|;
1681
  $column_header{transaction_description} =
1682
    qq|<th><a class=listheading href="$href&sort=transaction_description">|
1683
    . $locale->text("Transaction description") . qq|</a></th>|;
1670 1684

  
1671 1685
  $column_header{ids} = qq|<th></th>|;
1672 1686

  
......
1786 1800
    $column_data{"delivered"} = "<td>" .
1787 1801
      ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) .
1788 1802
      "</td>";
1803
    $column_data{transaction_description} = "<td>" . H($oe->{transaction_description}) . "</td>";
1789 1804

  
1790 1805
    $i++;
1791 1806
    $i %= 2;

Auch abrufbar als: Unified diff