Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c63316e6

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID c63316e626c2b6723f796edeb69f508cced8aae9
  • Vorgänger 54740168
  • Nachfolger 599030d5

Feld "Vorgangsbezeichnung" bei Verkaufsrechnungen hinzugefügt.

Unterschiede anzeigen:

SL/AR.pm
460 460
    qq|  a.duedate, a.netamount, a.amount, a.paid, | .
461 461
    qq|  a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
462 462
    qq|  a.shippingpoint, a.storno, a.globalproject_id, | .
463
    qq|  a.transaction_description, | .
463 464
    qq|  pr.projectnumber AS globalprojectnumber, | .
464 465
    qq|  c.name, | .
465 466
    qq|  e.name AS employee | .
......
481 482
    $where .= " AND a.department_id = ?";
482 483
    push(@values, $department_id);
483 484
  }
484
  foreach my $column (qw(invnumber ordnumber notes)) {
485
  foreach my $column (qw(invnumber ordnumber notes transaction_description)) {
485 486
    if ($form->{$column}) {
486 487
      $where .= " AND a.$column ILIKE ?";
487 488
      push(@values, $form->like($form->{$column}));
SL/IS.pm
974 974
                salesman_id = ?,
975 975
                storno = ?,
976 976
                globalproject_id = ?,
977
                cp_id = ?
977
                cp_id = ?,
978
                transaction_description = ?
978 979
              WHERE id = ?|;
979 980
  @values = ($form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
980 981
             conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}),
......
988 989
             conv_i($form->{"delivery_customer_id"}), conv_i($form->{"delivery_vendor_id"}),
989 990
             conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),
990 991
             $form->{"storno"} ? 't' : 'f', conv_i($form->{"globalproject_id"}),
991
             conv_i($form->{"cp_id"}),
992
             conv_i($form->{"cp_id"}), $form->{transaction_description},
992 993
             conv_i($form->{"id"}));
993 994
  do_query($form, $dbh, $query, @values);
994 995

  
......
1399 1400
           a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
1400 1401
           a.employee_id, a.salesman_id, a.payment_id,
1401 1402
           a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
1403
           a.transaction_description,
1402 1404
           e.name AS employee
1403 1405
         FROM ar a
1404 1406
         LEFT JOIN employee e ON (e.id = a.employee_id)
bin/mozilla/ar.pl
1295 1295
	  <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
1296 1296
	  <td colspan=3><input name=ordnumber size=20></td>
1297 1297
	</tr>
1298
       <tr>
1299
         <th align=right nowrap>| . $locale->text('Transaction description') . qq|</th>
1300
         <td colspan=3><input name=transaction_description size=40></td>
1301
       </tr>
1298 1302
	<tr>
1299 1303
	  <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
1300 1304
	  <td colspan=3><input name=notes size=40></td>
......
1371 1375
		<td nowrap>| . $locale->text('Subtotal') . qq|</td>
1372 1376
		<td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
1373 1377
		<td nowrap>| . $locale->text('Project Number') . qq|</td>
1378
		<td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
1379
		<td nowrap>| . $locale->text('Transaction description') . qq|</td>
1374 1380
	      </tr>
1375 1381
	    </table>
1376 1382
	  </td>
......
1446 1452
    $option .= "\n<br>" if $option;
1447 1453
    $option .= $locale->text('Notes') . " : $form->{notes}";
1448 1454
  }
1455
  if ($form->{transaction_description}) {
1456
    $callback .= "&transaction_description=" . $form->escape($form->{transaction_description}, 1);
1457
    $href .= "&transaction_description=" . $form->escape($form->{transaction_description});
1458
    $option .= "\n<br>" if $option;
1459
    $option .= $locale->text('Transaction description') . " : $form->{transaction_description}";
1460
  }
1449 1461

  
1450 1462
  if ($form->{transdatefrom}) {
1451 1463
    $callback .= "&transdatefrom=$form->{transdatefrom}";
......
1482 1494

  
1483 1495
  @columns =
1484 1496
    qw(transdate id type invnumber ordnumber name netamount tax amount paid
1485
       datepaid due duedate notes employee shippingpoint shipvia
1497
       datepaid due duedate transaction_description notes employee shippingpoint shipvia
1486 1498
       globalprojectnumber);
1487 1499

  
1488 1500
  $form->{"l_type"} = "Y";
......
1558 1570
    . "</a></th>";
1559 1571
  $column_header{globalprojectnumber} =
1560 1572
    qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
1573
  $column_header{transaction_description} =
1574
    "<th class=listheading>" . $locale->text('Transaction description') . "</th>";
1561 1575

  
1562 1576
  $form->{title} = $locale->text('AR Transactions');
1563 1577

  
......
1664 1678
    $column_data{employee}      = "<td>$ar->{employee}&nbsp;</td>";
1665 1679
    $column_data{globalprojectnumber}  =
1666 1680
      "<td>" . H($ar->{globalprojectnumber}) . "</td>";
1681
    $column_data{transaction_description}  =
1682
      "<td>" . H($ar->{transaction_description}) . "</td>";
1667 1683

  
1668 1684
    $i++;
1669 1685
    $i %= 2;
bin/mozilla/is.pl
719 719
	      <tr>
720 720
		<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
721 721
		<td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
722
	      </tr>|;
722
	      </tr>
723
              <tr>
724
                <th align="right">| . $locale->text('Transaction description') . qq|</th>
725
                <td colspan="3">| . $cgi->textfield("-name" => "transaction_description", "-size" => 35, "-value" => $form->{transaction_description}) . qq|</td>
726
              </tr>|;
723 727
#               <tr>
724 728
#                 <td colspan=4>
725 729
#                   <table>
locale/de/ar
156 156
  'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
157 157
  'Total'                       => 'Summe',
158 158
  'Transaction deleted!'        => 'Buchung gel?scht!',
159
  'Transaction description'     => 'Vorgangsbezeichnung',
159 160
  'Transaction posted!'         => 'Buchung verbucht!',
160 161
  'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
161 162
  'Type'                        => 'Typ',
locale/de/is
223 223
  'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
224 224
  'Total'                       => 'Summe',
225 225
  'Trade Discount'              => 'Rabatt',
226
  'Transaction description'     => 'Vorgangsbezeichnung',
226 227
  'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
227 228
  'Unit'                        => 'Einheit',
228 229
  'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',

Auch abrufbar als: Unified diff