X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=146e421ef17cf985524cf629caebdbbc59aceba1;hb=3f0ba2ba4caabdc8fc3191c5cbd0aba13a8643cb;hp=109ecb5726e0bc15a5d31f9f08fa50af1d898e31;hpb=8cef58b276ce4005c0e2ada350fecd5d7a103e89;p=kivitendo-erp.git
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 109ecb572..146e421ef 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -36,7 +36,7 @@ use SL::IS;
use SL::PE;
use Data::Dumper;
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
@@ -87,7 +87,7 @@ sub add {
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
AR->get_transdate(\%myconfig, $form);
@@ -471,18 +471,18 @@ selectcustomer}|
$form->{fokus} = "arledger.customer";
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
# with JavaScript Calendar
$button1 = qq|
-
{transdate} onBlur=\"check_right_date_format(this)\">
+
text('button') . qq|>
|;
$button2 = qq|
- {duedate} onBlur=\"check_right_date_format(this)\">
+
text('button') . qq|>
|;
@@ -495,11 +495,15 @@ selectcustomer}|
# without JavaScript Calendar
$button1 =
- qq| {transdate} onBlur=\"check_right_date_format(this)\"> |;
+ qq| |;
$button2 =
- qq| {duedate} onBlur=\"check_right_date_format(this)\"> |;
+ qq| |;
}
+ $form->{javascript} .=
+ qq|| .
+ qq||;
+
$form->header;
$onload = qq|focus()|;
$onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
@@ -530,7 +534,7 @@ selectcustomer}|
| . $locale->text('Customer') . qq|
- $customer
+ $customer
@@ -790,12 +794,12 @@ $jsscript
|;
$column_data{paid} =
- qq| {"paid_$i"} onBlur=\"check_right_number_format(this)\"> |;
+ qq| |;
$column_data{AR_paid} =
qq|${selectAR_paid} |;
$column_data{exchangerate} = qq|$exchangerate |;
$column_data{datepaid} =
- qq| {"datepaid_$i"} onBlur=\"check_right_date_format(this)\">
+ qq|
|;
$column_data{source} =
qq| |;
@@ -843,7 +847,6 @@ sub form_footer {
- {path}>
{login}>
{password}>
|
@@ -899,7 +902,7 @@ sub form_footer {
}
if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
+ require "bin/mozilla/menu.pl";
&menubar;
}
# button for saving history
@@ -1021,6 +1024,7 @@ sub post_payment {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+ $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
$form->error($locale->text('Cannot post payment for a closed period!'))
if ($datepaid <= $closedto);
@@ -1054,6 +1058,7 @@ sub post {
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
$form->error($locale->text('Cannot post transaction for a closed period!'))
if ($transdate <= $closedto);
@@ -1068,6 +1073,7 @@ sub post {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+ $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{"amount_$i"});
$form->error($locale->text('Cannot post payment for a closed period!'))
if ($datepaid <= $closedto);
@@ -1225,7 +1231,7 @@ sub search {
$form->{javascript} .= qq||;
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
@@ -1296,6 +1302,10 @@ sub search {
| . $locale->text('Order Number') . qq|
+
+ | . $locale->text('Transaction description') . qq|
+
+
| . $locale->text('Notes') . qq|
@@ -1372,6 +1382,8 @@ sub search {
| . $locale->text('Subtotal') . qq|
| . $locale->text('Project Number') . qq|
+
+ | . $locale->text('Transaction description') . qq|
@@ -1386,7 +1398,6 @@ sub search {
{nextsub}>
- {path}>
{login}>
{password}>
@@ -1415,7 +1426,7 @@ sub ar_transactions {
AR->ar_transactions(\%myconfig, \%$form);
$callback =
- "$form->{script}?action=ar_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=ar_transactions&login=$form->{login}&password=$form->{password}";
$href = $callback;
if ($form->{customer}) {
@@ -1448,6 +1459,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}";
@@ -1484,7 +1501,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";
@@ -1560,6 +1577,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');
@@ -1645,12 +1664,18 @@ sub ar_transactions {
$module = ($ar->{invoice}) ? "is.pl" : $form->{script};
$column_data{invnumber} =
- "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{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)") :
- $ar->{amount} < 0 ?
- $locale->text("Credit note (one letter abbreviation)") :
- $locale->text("Invoice (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)"))
+ . "";
$column_data{ordnumber} = "$ar->{ordnumber} ";
$column_data{name} = "$ar->{name} ";
$ar->{notes} =~ s/\r\n/ /g;
@@ -1660,6 +1685,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;
@@ -1720,7 +1747,6 @@ sub ar_transactions {
- {path}>
{login}>
{password}>