From: Moritz Bunkus Date: Fri, 4 May 2007 13:28:58 +0000 (+0000) Subject: Feld "Vorgangsbezeichnung" bei Verkaufsrechnungen hinzugefügt. X-Git-Tag: release-2.4.3^2~387 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c63316e626c2b6723f796edeb69f508cced8aae9;p=kivitendo-erp.git Feld "Vorgangsbezeichnung" bei Verkaufsrechnungen hinzugefügt. --- diff --git a/SL/AR.pm b/SL/AR.pm index ed3bfb8a4..d837f8daa 100644 --- 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.transaction_description, | . 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); } - 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})); diff --git a/SL/IS.pm b/SL/IS.pm index 205cbcbaf..e703fcc7b 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -974,7 +974,8 @@ Message: $form->{message}\r| if $form->{message}; 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"}), @@ -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->{"cp_id"}), + conv_i($form->{"cp_id"}), $form->{transaction_description}, 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.transaction_description, 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 e7b36efc0..382e733d3 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -1295,6 +1295,10 @@ sub search { | . $locale->text('Order Number') . qq| + + | . $locale->text('Transaction description') . qq| + + | . $locale->text('Notes') . qq| @@ -1371,6 +1375,8 @@ sub search { | . $locale->text('Subtotal') . qq| | . $locale->text('Project Number') . qq| + + | . $locale->text('Transaction description') . qq| @@ -1446,6 +1452,12 @@ sub ar_transactions { $option .= "\n
" 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
" if $option; + $option .= $locale->text('Transaction description') . " : $form->{transaction_description}"; + } 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 - datepaid due duedate notes employee shippingpoint shipvia + datepaid due duedate transaction_description notes employee shippingpoint shipvia globalprojectnumber); $form->{"l_type"} = "Y"; @@ -1558,6 +1570,8 @@ sub ar_transactions { . ""; $column_header{globalprojectnumber} = qq|| . $locale->text('Project Number') . qq||; + $column_header{transaction_description} = + "" . $locale->text('Transaction description') . ""; $form->{title} = $locale->text('AR Transactions'); @@ -1664,6 +1678,8 @@ sub ar_transactions { $column_data{employee} = "$ar->{employee} "; $column_data{globalprojectnumber} = "" . H($ar->{globalprojectnumber}) . ""; + $column_data{transaction_description} = + "" . H($ar->{transaction_description}) . ""; $i++; $i %= 2; diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 50e013b5d..e94bb386e 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -719,7 +719,11 @@ print qq| | . $locale->text('Ship via') . qq| - |; + + + | . $locale->text('Transaction description') . qq| + | . $cgi->textfield("-name" => "transaction_description", "-size" => 35, "-value" => $form->{transaction_description}) . qq| + |; # # # diff --git a/locale/de/ar b/locale/de/ar index c34ab7835..8a37cd981 100644 --- 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!', + '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', diff --git a/locale/de/is b/locale/de/is index 126e91650..b1b49e920 100644 --- 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', + '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\'.',