X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=2ffccd39be5db60682571704dd1b43c5df7faf4d;hb=864b73ffb0964215f287a393ea37ec2eef6eb8eb;hp=6e4d1d017301b19c43f087cb97e519568225ae6e;hpb=656824184939043cb4b8aa1edafef926f7ed1e8e;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 6e4d1d017..2ffccd39b 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -293,6 +293,7 @@ sub search {
| . $locale->text('From') . qq| |
$button1
+ | . $locale->text('To (time)') . qq| |
$button2
@@ -749,16 +750,23 @@ sub generate_report {
}
}
+ $transdate = "";
+ foreach $key (sort keys(%{ $ref->{transdate} })) {
+ if ($key == 0) {
+ $transdate = "$ref->{transdate}{$key}";
+ } else {
+ $transdate .= "
$ref->{transdate}{$key}";
+ }
+ }
+
# $ref->{debit} = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
# $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
$column_data{id} = " $ref->{id} | ";
- $column_data{transdate} =
- " $ref->{transdate} | ";
+ $column_data{transdate} = "$transdate | ";
$column_data{reference} =
"{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference} | ";
- $column_data{description} =
- "$ref->{description} | ";
+ $column_data{description} = "$ref->{description} | ";
$column_data{source} = "$ref->{source} | ";
$column_data{notes} = "$ref->{notes} | ";
$column_data{debit} = "$debit | ";
@@ -848,14 +856,7 @@ sub generate_report {
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ . $locale->text('Vendor Invoice') . qq|">
@@ -1464,11 +1465,6 @@ sub form_footer {
}
}
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
print "
@@ -1692,6 +1688,11 @@ sub post {
if ($form->round_amount($debit, 2) != $form->round_amount($credit, 2)) {
$form->error($locale->text('Out of balance transaction!'));
}
+
+ if ($form->round_amount($debit, 2) + $form->round_amount($credit, 2) == 0) {
+ $form->error($locale->text('Empty transaction!'));
+ }
+
if (($errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
$errno *= -1;
$err[1] = $locale->text('Cannot have a value in both Debit and Credit!');