X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=382e733d3624e01e1386c62d66e5fa081b60e938;hb=b5157f97d47413e5f33cced1d0de527979ff3d61;hp=da33886a12e23d10b012e8775b6ddd919c30b36d;hpb=3c5e4df9e938a8f2c9b045774bda00095b976e49;p=kivitendo-erp.git
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index da33886a1..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');
@@ -1644,8 +1658,13 @@ sub ar_transactions {
$column_data{invnumber} =
"{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber} | ";
+
+ my $is_storno = $ar->{storno} && ($ar->{invnumber} =~ /^Storno zu/);
+ my $has_storno = $ar->{storno} && !$is_storno;
+
$column_data{type} = "" .
- ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
+ ($has_storno ? $locale->text("Invoice with Storno (abbreviation)") :
+ $is_storno ? $locale->text("Storno (one letter abbreviation)") :
$ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") :
$ar->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
$locale->text("AR Transaction (abbreviation)"))
@@ -1659,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;