X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fgl.pl;h=b14fb6f3a1f387850b5d828503fc4a00a81630a2;hb=4e0ea59f3859c72426f669547de922816305e92d;hp=43f5447cc60b89eaa09382e33356ea8e6704cd9b;hpb=dc7f3c9afe98b033d29c645cd9d9ced238663fbc;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 43f5447cc..b14fb6f3a 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -105,6 +105,8 @@ sub add {
} (@{ $form->{all_departments} });
}
+ $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+
&display_form(1);
$lxdebug->leave_sub();
@@ -189,6 +191,8 @@ sub edit {
$form->{title} = "Edit";
+ $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+
form_header();
display_rows();
form_footer();
@@ -237,7 +241,7 @@ sub search {
'-labels' => \%project_labels));
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
@@ -1055,6 +1059,7 @@ sub display_rows {
my ($init) = @_;
$lxdebug->enter_sub();
+ $form->{debit_1} = 0 if !$form->{"debit_1"};
$form->{totaldebit} = 0;
$form->{totalcredit} = 0;
@@ -1148,7 +1153,7 @@ sub display_rows {
if ($init) {
$korrektur =
- qq|
|;
+ qq| | | |;
if ($form->{transfer}) {
$fx_transaction = qq|
|
@@ -1214,20 +1219,27 @@ sub display_rows {
'-labels' => \%project_labels,
'-default' => $form->{"project_id_$i"} ));
+ my $copy2credit = 'onkeyup="copy_debit_to_credit()"' if $i == 1;
+
print qq|
$accno
$fx_transaction
- |
+ |
|
|
$korrektur
- $tax
+ $tax|;
+
+ if ($form->{show_details}) {
+ print qq|
$source
$memo
$projectnumber |
+|;
+ }
+ print qq|
-
- |;
+|;
}
$form->hide_form(qw(rowcount selectaccno));
@@ -1243,11 +1255,14 @@ sub form_header {
$form->{title} = $locale->text("$title General Ledger Transaction");
$readonly = ($form->{id}) ? "readonly" : "";
+ $show_details_checked = "checked" if $form->{show_details};
+
# $locale->text('Add General Ledger Transaction')
# $locale->text('Edit General Ledger Transaction')
map { $form->{$_} =~ s/\"/"/g }
qw(reference description chart taxchart);
+
$form->{javascript} = qq||;
+ $form->{javascript} .= qq||;
$form->{selectdepartment} =~ s/ selected//;
$form->{selectdepartment} =~
@@ -1300,7 +1322,7 @@ sub form_header {
}
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
@@ -1321,6 +1343,9 @@ sub form_header {
qq| | |;
}
+ $form->{previous_id} ||= "--";
+ $form->{previous_gldate} ||= "--";
+
$form->header;
print qq|
@@ -1329,7 +1354,7 @@ sub form_header {