Feld "Vorgangsbezeichnung" bei Verkaufsrechnungen hinzugefügt.

diff --git a/SL/AR.pm b/SL/AR.pm
index ed3bfb8a478691e16b35fefd5a1437fc34390349..d837f8daafda72c4f1456f7a973ecb58c3469b8a 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -460,6 +460,7 @@ sub ar_transactions {
     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.globalproject_id, | .
     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.globalproject_id, | .

+    qq|  a.transaction_description, | .

     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, | .
     qq|  e.name AS employee | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, | .
     qq|  e.name AS employee | .


@@ -481,7 +482,7 @@ sub ar_transactions {
     $where .= " AND a.department_id = ?";
     push(@values, $department_id);
   }
     $where .= " AND a.department_id = ?";
     push(@values, $department_id);
   }

-  foreach my $column (qw(invnumber ordnumber notes)) {
+  foreach my $column (qw(invnumber ordnumber notes transaction_description)) {

     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
       push(@values, $form->like($form->{$column}));
     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
       push(@values, $form->like($form->{$column}));

diff --git a/SL/IS.pm b/SL/IS.pm
index 205cbcbaf78d39846beffab1a9a0bfe369570440..e703fcc7b5eedc0cc0e073aa930e89fc2e79afc0 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -974,7 +974,8 @@ Message: $form->{message}\r| if $form->{message};
                 salesman_id = ?,
                 storno = ?,
                 globalproject_id = ?,
                 salesman_id = ?,
                 storno = ?,
                 globalproject_id = ?,

-                cp_id = ?
+                cp_id = ?,
+                transaction_description = ?

               WHERE id = ?|;
   @values = ($form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
              conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}),
               WHERE id = ?|;
   @values = ($form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
              conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}),


@@ -988,7 +989,7 @@ Message: $form->{message}\r| if $form->{message};
              conv_i($form->{"delivery_customer_id"}), conv_i($form->{"delivery_vendor_id"}),
              conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),
              $form->{"storno"} ? 't' : 'f', conv_i($form->{"globalproject_id"}),
              conv_i($form->{"delivery_customer_id"}), conv_i($form->{"delivery_vendor_id"}),
              conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),
              $form->{"storno"} ? 't' : 'f', conv_i($form->{"globalproject_id"}),

-             conv_i($form->{"cp_id"}),
+             conv_i($form->{"cp_id"}), $form->{transaction_description},

              conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
 
              conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
 


@@ -1399,6 +1400,7 @@ sub retrieve_invoice {
            a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
            a.employee_id, a.salesman_id, a.payment_id,
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
            a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
            a.employee_id, a.salesman_id, a.payment_id,
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,

+           a.transaction_description,

            e.name AS employee
          FROM ar a
          LEFT JOIN employee e ON (e.id = a.employee_id)
            e.name AS employee
          FROM ar a
          LEFT JOIN employee e ON (e.id = a.employee_id)

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index e7b36efc04d6b0e78e967128adca147350c0ded1..382e733d3624e01e1386c62d66e5fa081b60e938 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1295,6 +1295,10 @@ sub search {
          <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
          <td colspan=3><input name=ordnumber size=20></td>
        </tr>
          <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
          <td colspan=3><input name=ordnumber size=20></td>
        </tr>

+       <tr>
+         <th align=right nowrap>| . $locale->text('Transaction description') . qq|</th>
+         <td colspan=3><input name=transaction_description size=40></td>
+       </tr>

        <tr>
          <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>
        <tr>
          <th align=right nowrap>| . $locale->text('Notes') . qq|</th>
          <td colspan=3><input name=notes size=40></td>


@@ -1371,6 +1375,8 @@ sub search {
                <td nowrap>| . $locale->text('Subtotal') . qq|</td>
                <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Project Number') . qq|</td>
                <td nowrap>| . $locale->text('Subtotal') . qq|</td>
                <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Project Number') . qq|</td>

+               <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Transaction description') . qq|</td>

              </tr>
            </table>
          </td>
              </tr>
            </table>
          </td>


@@ -1446,6 +1452,12 @@ sub ar_transactions {
     $option .= "\n<br>" if $option;
     $option .= $locale->text('Notes') . " : $form->{notes}";
   }
     $option .= "\n<br>" if $option;
     $option .= $locale->text('Notes') . " : $form->{notes}";
   }

+  if ($form->{transaction_description}) {
+    $callback .= "&transaction_description=" . $form->escape($form->{transaction_description}, 1);
+    $href .= "&transaction_description=" . $form->escape($form->{transaction_description});
+    $option .= "\n<br>" if $option;
+    $option .= $locale->text('Transaction description') . " : $form->{transaction_description}";
+  }

 
   if ($form->{transdatefrom}) {
     $callback .= "&transdatefrom=$form->{transdatefrom}";
 
   if ($form->{transdatefrom}) {
     $callback .= "&transdatefrom=$form->{transdatefrom}";


@@ -1482,7 +1494,7 @@ sub ar_transactions {
 
   @columns =
     qw(transdate id type invnumber ordnumber name netamount tax amount paid
 
   @columns =
     qw(transdate id type invnumber ordnumber name netamount tax amount paid

-       datepaid due duedate notes employee shippingpoint shipvia
+       datepaid due duedate transaction_description notes employee shippingpoint shipvia

        globalprojectnumber);
 
   $form->{"l_type"} = "Y";
        globalprojectnumber);
 
   $form->{"l_type"} = "Y";


@@ -1558,6 +1570,8 @@ sub ar_transactions {
     . "</a></th>";
   $column_header{globalprojectnumber} =
     qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
     . "</a></th>";
   $column_header{globalprojectnumber} =
     qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;

+  $column_header{transaction_description} =
+    "<th class=listheading>" . $locale->text('Transaction description') . "</th>";

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


@@ -1664,6 +1678,8 @@ sub ar_transactions {
     $column_data{employee}      = "<td>$ar->{employee}&nbsp;</td>";
     $column_data{globalprojectnumber}  =
       "<td>" . H($ar->{globalprojectnumber}) . "</td>";
     $column_data{employee}      = "<td>$ar->{employee}&nbsp;</td>";
     $column_data{globalprojectnumber}  =
       "<td>" . H($ar->{globalprojectnumber}) . "</td>";

+    $column_data{transaction_description}  =
+      "<td>" . H($ar->{transaction_description}) . "</td>";

 
     $i++;
     $i %= 2;
 
     $i++;
     $i %= 2;

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 50e013b5d4d54d9ab94387b5ff33155acd919ff9..e94bb386e11dc1f8fd65baf04aeb870b6910a8ab 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -719,7 +719,11 @@ print qq|
              <tr>
                <th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
                <td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
              <tr>
                <th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
                <td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>

-             </tr>|;
+             </tr>
+              <tr>
+                <th align="right">| . $locale->text('Transaction description') . qq|</th>
+                <td colspan="3">| . $cgi->textfield("-name" => "transaction_description", "-size" => 35, "-value" => $form->{transaction_description}) . qq|</td>
+              </tr>|;

 #               <tr>
 #                 <td colspan=4>
 #                   <table>
 #               <tr>
 #                 <td colspan=4>
 #                   <table>

diff --git a/locale/de/ar b/locale/de/ar
index c34ab7835a7285402edb40aec8941db33ade3acb..8a37cd981c52c914fd3c693f6a5c6d87507e1f64 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -156,6 +156,7 @@ $self->{texts} = {
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'Total'                       => 'Summe',
   'Transaction deleted!'        => 'Buchung gelöscht!',
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'Total'                       => 'Summe',
   'Transaction deleted!'        => 'Buchung gelöscht!',

+  'Transaction description'     => 'Vorgangsbezeichnung',

   'Transaction posted!'         => 'Buchung verbucht!',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Type'                        => 'Typ',
   'Transaction posted!'         => 'Buchung verbucht!',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Type'                        => 'Typ',

diff --git a/locale/de/is b/locale/de/is
index 126e9165007afd4d7ee5b23a992ac99e3b029a29..b1b49e920988a451bc5d33b48506892e907683da 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -223,6 +223,7 @@ $self->{texts} = {
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'Total'                       => 'Summe',
   'Trade Discount'              => 'Rabatt',
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'Total'                       => 'Summe',
   'Trade Discount'              => 'Rabatt',

+  'Transaction description'     => 'Vorgangsbezeichnung',

   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abhängigkeit \'%s\'.',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abhängigkeit \'%s\'.',