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:

SL/OE.pm
66 66
    qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
67 67
    qq|  o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
68 68
    qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
69
    qq|  o.transaction_description, | .
69 70
    qq|  ex.$rate AS exchangerate, | .
70 71
    qq|  pr.projectnumber AS globalprojectnumber, | .
71 72
    qq|  e.name AS employee | .
......
128 129
    push(@values, conv_date($form->{transdateto}));
129 130
  }
130 131

  
132
  if ($form->{transaction_description}) {
133
    $query .= qq| AND o.transaction_description ILIKE ?|;
134
    push(@values, '%' . $form->{transaction_description} . '%');
135
  }
136

  
131 137
  my $sortorder = join(', ', ("o.id", $form->sort_columns("transdate", $ordnumber, "name")));
132 138
  my %allowed_sort_columns =
133 139
    ("transdate" => "o.transdate",
......
137 143
     "quonumber" => "o.quonumber",
138 144
     "name" => "ct.name",
139 145
     "employee" => "e.name",
140
     "shipvia" => "o.shipvia");
146
     "shipvia" => "o.shipvia",
147
     "transaction_description" => "o.transaction_description");
141 148
  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
142 149
    $sortorder = $allowed_sort_columns{$form->{sort}};
143 150
  }
......
407 414
    qq|shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?, | .
408 415
    qq|delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?, | .
409 416
    qq|taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?, | .
410
    qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ? | .
417
    qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ? | .
411 418
    qq|WHERE id = ?|;
412 419

  
413 420
  @values = ($form->{ordnumber}, $form->{quonumber},
......
425 432
             conv_i($form->{delivery_customer_id}),
426 433
             conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
427 434
             conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
435
             $form->{transaction_description},
428 436
             conv_i($form->{id}));
429 437
  do_query($form, $dbh, $query, @values);
430 438

  
......
669 677
      qq|  o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber, | .
670 678
      qq|  d.description AS department, o.payment_id, o.language_id, o.taxzone_id, | .
671 679
      qq|  o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, | .
672
      qq|  o.globalproject_id, o.delivered | .
680
      qq|  o.globalproject_id, o.delivered, o.transaction_description | .
673 681
      qq|FROM oe o | .
674 682
      qq|JOIN ${vc} cv ON (o.${vc}_id = cv.id) | .
675 683
      qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
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;
doc/dokumentenvorlagen-und-variablen.html
621 621
    <td><code>total</code></td>
622 622
    <td>Restsumme der Rechnung (Summe abz&uuml;glich bereits bezahlter Posten)</td>
623 623
   </tr>
624
   <tr>
625
    <td><code>transaction_description</code></td>
626
    <td>Vorgangsbezeichnung</td>
627
   </tr>
624 628
   <tr>
625 629
    <td><code>transdate</code></td>
626 630
    <td>Auftragsdatum wenn die Rechnung aus einem Auftrag erstellt wurde</td>
locale/de/all
1074 1074
  'Trade Discount'              => 'Rabatt',
1075 1075
  'Transaction Date missing!'   => 'Buchungsdatum fehlt!',
1076 1076
  'Transaction deleted!'        => 'Buchung gel?scht!',
1077
  'Transaction description'     => 'Vorgangsbezeichnung',
1077 1078
  'Transaction posted!'         => 'Buchung verbucht!',
1078 1079
  'Transaction reversal enforced for all dates' => 'Fehleintragungen m?ssen f?r jeden Zeitraum mit einer Kontraeintragung ausgebessert werden',
1079 1080
  'Transaction reversal enforced up to' => 'Fehleintragungen k?nnen bis zu dem angegebenen Zeitraum nur mit einer Kontraeintragung ausgebessert werden!',
locale/de/oe
226 226
  'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
227 227
  'Total'                       => 'Summe',
228 228
  'Trade Discount'              => 'Rabatt',
229
  'Transaction description'     => 'Vorgangsbezeichnung',
229 230
  'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
230 231
  'Unit'                        => 'Einheit',
231 232
  'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
sql/Pg-upgrade2/transaction_description.sql
1
-- @tag: transaction_description
2
-- @description: Neue Spalte f&uuml;r ein Feld &quot;Vorgangsbezeichnung&quot; in Verkaufs- und Einkaufsmasken
3
-- @depends: release_2_4_2
4
ALTER TABLE ap ADD COLUMN transaction_description text;
5
ALTER TABLE ar ADD COLUMN transaction_description text;
6
ALTER TABLE oe ADD COLUMN transaction_description text;

Auch abrufbar als: Unified diff