#
#======================================================================
+use utf8;
+use strict;
+
use POSIX qw(strftime);
use List::Util qw(sum);
require "bin/mozilla/drafts.pl";
require "bin/mozilla/reportgenerator.pl";
-1;
-
-# end of main
-
# this is for our long dates
# $locale->text('January')
# $locale->text('February')
# $locale->text('Dec')
sub add {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- return $lxdebug->leave_sub() if (load_draft_maybe());
+ return $main::lxdebug->leave_sub() if (load_draft_maybe());
$form->{title} = "Add";
$form->{callback} = "gl.pl?action=add" unless $form->{callback};
# we use this only to set a default date
+ # yep. aber er holt hier auch schon ALL_CHARTS. Aufwand / Nutzen? jb
GL->transaction(\%myconfig, \%$form);
- map {
- $tax .=
- qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription} |
- . ($_->{rate} * 100) . qq| %|
- } @{ $form->{TAX} };
-
$form->{rowcount} = 2;
$form->{debit} = 0;
# departments
$form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
map {
$form->{selectdepartment} .=
"<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
+ } (@{ $form->{all_departments} || [] });
}
$form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
&display_form(1);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub prepare_transaction {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger');
+ $main::auth->assert('general_ledger');
- GL->transaction(\%myconfig, \%$form);
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- map {
- $tax .=
- qq|<option value="$_->{id}--$_->{rate}">$_->{taxdescription} |
- . ($_->{rate} * 100) . qq| %|
- } @{ $form->{TAX} };
+ GL->transaction(\%myconfig, \%$form);
$form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
# departments
$form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
map {
$form->{selectdepartment} .=
"<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
+ } (@{ $form->{all_departments} || [] });
}
my $i = 1;
my $tax = 0;
my $taxaccno = "";
- foreach $ref (@{ $form->{GL} }) {
- $j = $i - 1;
+ foreach my $ref (@{ $form->{GL} }) {
+ my $j = $i - 1;
if ($tax && ($ref->{accno} eq $taxaccno)) {
$form->{"tax_$j"} = abs($ref->{amount});
$form->{"taxchart_$j"} = $ref->{id} . "--" . $ref->{taxrate};
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub edit {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
prepare_transaction();
display_rows();
form_footer();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub search {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger');
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
$form->{title} = $locale->text('Journal');
$form->all_departments(\%myconfig);
# departments
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
map {
$form->{selectdepartment} .=
"<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} });
+ } (@{ $form->{all_departments} || [] });
}
- $department = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- </tr>
+ my $department = qq|
+ <tr>
+ <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+ <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+ </tr>
| if $form->{selectdepartment};
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 1 });
+ "all" => 1},
+ "employees" => "ALL_EMPLOYEES" );
my %project_labels = ();
my @project_values = ("");
'-values' => \@project_values,
'-labels' => \%project_labels));
+ my %employee_labels = ();
+ my @employee_values = ("");
+ foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) {
+ # value in Form "1234--Name" übergeben
+ my $id = "$item->{'id'}--$item->{'name'}";
+ push(@employee_values, "$id");
+ $employee_labels{$id} = $item->{"name"};
+ }
+
+ my $employeenumber =
+ NTI($cgi->popup_menu('-name' => "employee",
+ '-values' => \@employee_values,
+ '-labels' => \%employee_labels));
+
# use JavaScript Calendar or not
$form->{jsscript} = 1;
- $jsscript = "";
+ my $jsscript = "";
+ my ($button1, $button2, $onload);
if ($form->{jsscript}) {
# with JavaScript Calendar
<form method=post action=gl.pl>
-<input type=hidden name=sort value=transdate>
+<input type=hidden name=sort value=datesort>
<table width=100%>
<tr>
<tr>
<td>
<table>
- <tr>
- <th align=right>| . $locale->text('Reference') . qq|</th>
- <td><input name=reference size=20></td>
- <th align=right>| . $locale->text('Source') . qq|</th>
- <td><input name=source size=20></td>
- </tr>
- $department
- <tr>
- <th align=right>| . $locale->text('Description') . qq|</th>
- <td colspan=3><input name=description size=40></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Notes') . qq|</th>
- <td colspan=3><input name=notes size=40></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Project Number') . qq|</th>
- <td colspan=3>$projectnumber</td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
+ <tr>
+ <th align=right>| . $locale->text('Reference') . qq|</th>
+ <td><input name=reference size=20></td>
+ <th align=right>| . $locale->text('Source') . qq|</th>
+ <td><input name=source size=20></td>
+ </tr>
+ $department
+ <tr>
+ <th align=right>| . $locale->text('Description') . qq|</th>
+ <td><input name=description size=40></td>
+ <th align=right>| . $locale->text('Account Number') . qq|</th>
+ <td><input name=accno size=20></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Notes') . qq|</th>
+ <td colspan=3><input name=notes size=40></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Project Number') . qq|</th>
+ <td colspan=3>$projectnumber</td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('From') . qq|</th>
+ <tr>
+ <th align=right>| . $locale->text('Employee') . qq|</th>
+ <td colspan=3>$employeenumber</td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Date Sorting') . qq|</th>
+ <td colspan=3>
+ <input name=datesort class=radio type=radio value=gldate checked> | . $locale->text('Booking Date') . qq|
+ <input name=datesort class=radio type=radio value=transdate> | . $locale->text('Invoice Date') . qq|
+ </td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('From') . qq|</th>
$button1
- <th align=right>| . $locale->text('To (time)') . qq|</th>
+ <th align=right>| . $locale->text('To (time)') . qq|</th>
$button2
- </tr>
- <tr>
- <th align=right>| . $locale->text('Include in Report') . qq|</th>
- <td colspan=3>
- <table>
- <tr>
- <td>
- <input name="category" class=radio type=radio value=X checked> |
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Include in Report') . qq|</th>
+ <td colspan=3>
+ <tr>
+ <td>
+ <input name="category" class=radio type=radio value=X checked> |
. $locale->text('All') . qq|
- <input name="category" class=radio type=radio value=A> |
+ <input name="category" class=radio type=radio value=A> |
. $locale->text('Asset') . qq|
- <input name="category" class=radio type=radio value=L> |
+ <input name="category" class=radio type=radio value=L> |
. $locale->text('Liability') . qq|
- <input name="category" class=radio type=radio value=I> |
+ <input name="category" class=radio type=radio value=I> |
. $locale->text('Revenue') . qq|
- <input name="category" class=radio type=radio value=E> |
+ <input name="category" class=radio type=radio value=E> |
. $locale->text('Expense') . qq|
- </td>
- </tr>
- <tr>
- <table>
- <tr>
- <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('ID') . qq|</td>
- <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Date') . qq|</td>
- <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Reference') . qq|</td>
- <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Description') . qq|</td>
- <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Notes') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Debit') . qq|</td>
- <td align=right><input name="l_credit" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Credit') . qq|</td>
- <td align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Source') . qq|</td>
- <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Account') . qq|</td>
- </tr>
- <tr>
- <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Subtotal') . qq|</td>
- <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Project Number') . qq|</td>
- </tr>
- </table>
- </tr>
- </table>
- </tr>
+ </td>
+ </tr>
+ <tr>
+ <table>
+ <tr>
+ <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('ID') . qq|</td>
+ <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Invoice Date') . qq|</td>
+ <td align=right><input name="l_gldate" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Booking Date') . qq|</td>
+ <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Reference') . qq|</td>
+ <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Description') . qq|</td>
+ <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Notes') . qq|</td>
+ </tr>
+ <tr>
+ <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Debit') . qq|</td>
+ <td align=right><input name="l_credit" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Credit') . qq|</td>
+ <td align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Source') . qq|</td>
+ <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Account') . qq|</td>
+ </tr>
+ <tr>
+ <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Subtotal') . qq|</td>
+ <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Project Number') . qq|</td>
+ <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Employee') . qq|</td>
+ </tr>
+ </table>
+ </tr>
+ </table>
+ </tr>
</table>
</td>
</tr>
</body>
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub create_subtotal_row {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
map { $totals->{$_} = 0 } @{ $subtotal_columns };
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}
sub generate_report {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- report_generator_set_default_sort('transdate', 1);
+ # generate_report wird beim ersten Aufruf per Weiter-Knopf und POST mit der hidden Variablen sort mit Wert "datesort" (früher "transdate" als Defaultsortiervariable) übertragen
+
+ # <form method=post action=gl.pl>
+ # <input type=hidden name=sort value=datesort> # form->{sort} setzen
+ # <input type=hidden name=nextsub value=generate_report>
+
+ # anhand von neuer Variable datesort wird jetzt $form->{sort} auf transdate oder gldate gesetzt
+ # damit ist die Hidden Variable "sort" wahrscheinlich sogar überflüssig
+
+ # ändert man die Sortierreihenfolge per Klick auf eine der Überschriften wird die Variable "sort" per GET übergeben, z.B. id,transdate, gldate, ...
+ # gl.pl?action=generate_report&employee=18383--Jan%20B%c3%bcren&datesort=transdate&category=X&l_transdate=Y&l_gldate=Y&l_id=Y&l_reference=Y&l_description=Y&l_source=Y&l_debit=Y&l_credit=Y&sort=gldate&sortdir=0
+
+ if ( $form->{sort} eq 'datesort' ) { # sollte bei einem Post (Aufruf aus Suchmaske) immer wahr sein
+ # je nachdem ob in Suchmaske "transdate" oder "gldate" ausgesucht wurde erstes Suchergebnis entsprechend sortieren
+ $form->{sort} = $form->{datesort};
+ };
+
+ # was passiert hier?
+ report_generator_set_default_sort("$form->{datesort}", 1);
+# report_generator_set_default_sort('transdate', 1);
GL->all_transactions(\%myconfig, \%$form);
my $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
my @columns = qw(
- transdate id reference description
- notes source debit debit_accno
+ gldate transdate id reference description
+ notes source debit debit_accno
credit credit_accno debit_tax debit_tax_accno
- credit_tax credit_tax_accno projectnumbers balance
+ credit_tax credit_tax_accno projectnumbers balance employee
);
- my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto category l_subtotal);
+ # add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
+ my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto employee datesort category l_subtotal);
push @hidden_variables, map { "l_${_}" } @columns;
+ foreach ( @hidden_variables ) {
+ print URL "$_\n";
+ };
my (@options, @date_options);
push @options, $locale->text('Account') . " : $form->{accno} $form->{account_description}" if ($form->{accno});
push @options, $locale->text('Reference') . " : $form->{reference}" if ($form->{reference});
push @options, $locale->text('Description') . " : $form->{description}" if ($form->{description});
push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
-
+ push @options, $locale->text('Employee') . " : $form->{employee_name}" if ($form->{employee_name});
+ my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Invoice Date') : $locale->text('Booking Date');
+ push @date_options, "$datesorttext" if ($form->{datesort} and ($form->{datefrom} or $form->{dateto}));
push @date_options, $locale->text('From'), $locale->date(\%myconfig, $form->{datefrom}, 1) if ($form->{datefrom});
push @date_options, $locale->text('Bis'), $locale->date(\%myconfig, $form->{dateto}, 1) if ($form->{dateto});
push @options, join(' ', @date_options) if (scalar @date_options);
my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
+ print URL $callback;
+ close URL;
$form->{l_credit_accno} = 'Y';
$form->{l_debit_accno} = 'Y';
$form->{l_credit_tax} = 'Y';
$form->{l_debit_tax} = 'Y';
+# $form->{l_gldate} = 'Y'; # Spalte mit gldate immer anzeigen
$form->{l_credit_tax_accno} = 'Y';
+ $form->{l_datesort} = 'Y';
$form->{l_debit_tax_accno} = 'Y';
$form->{l_balance} = $form->{accno} ? 'Y' : '';
my %column_defs = (
'id' => { 'text' => $locale->text('ID'), },
- 'transdate' => { 'text' => $locale->text('Date'), },
+ 'transdate' => { 'text' => $locale->text('Invoice Date'), },
+ 'gldate' => { 'text' => $locale->text('Booking Date'), },
'reference' => { 'text' => $locale->text('Reference'), },
'source' => { 'text' => $locale->text('Source'), },
'description' => { 'text' => $locale->text('Description'), },
'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), },
'balance' => { 'text' => $locale->text('Balance'), },
'projectnumbers' => { 'text' => $locale->text('Project Numbers'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
);
- foreach my $name (qw(id transdate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+ foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
my $sortname = $name =~ m/accno/ ? 'accno' : $name;
my $sortdir = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
my %column_alignment;
map { $column_alignment{$_} = 'right' } qw(balance id debit credit debit_tax credit_tax balance);
- map { $column_alignment{$_} = 'center' } qw(transdate reference description source notes debit_accno credit_accno debit_tax_accno credit_tax_accno);
+ map { $column_alignment{$_} = 'center' } qw(transdate gldate reference debit_accno credit_accno debit_tax_accno credit_tax_accno);
+ map { $column_alignment{$_} = 'left' } qw(description source notes);
map { $column_defs{$_}->{align} = $column_alignment{$_} } keys %column_alignment;
my $report = SL::ReportGenerator->new(\%myconfig, $form);
'attachment_basename' => $locale->text('general_ledger_list') . strftime('_%Y%m%d', localtime time),
);
$report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
# add sort to callback
$form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
my %totals = map { $_ => 0 } @totals_columns;
my $idx = 0;
- foreach $ref (@{ $form->{GL} }) {
+ foreach my $ref (@{ $form->{GL} }) {
my %rows;
$row->{balance}->{data} = $data;
$row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
- map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes);
+ map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee);
map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub update {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger');
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
$form->{oldtransdate} = $form->{transdate};
my $credittax = 0;
my $debitcount = 0;
my $creditcount = 0;
- $debitlock = 0;
- $creditlock = 0;
+ my ($debitcredit, $amount);
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
$form->{"credit_$i"} = 0;
$form->{"tax_$i"} = 0;
$creditcount--;
- $creditlock = 1;
+ $form->{creditlock} = 1;
}
if (($creditcount >= 2) && ($debitcount == 2)) {
$form->{"debit_$i"} = 0;
$form->{"tax_$i"} = 0;
$debitcount--;
- $debitlock = 1;
+ $form->{debitlock} = 1;
}
if (($creditcount == 1) && ($debitcount == 2)) {
- $creditlock = 1;
+ $form->{creditlock} = 1;
}
if (($creditcount == 2) && ($debitcount == 1)) {
- $debitlock = 1;
+ $form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
$form->{"taxchart_$i"} = "0--0.00";
($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
: $form->{"debit_$i"};
- $j = $#a;
+ my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
$form->{"taxchart_$i"} = "0--0.00";
$form->{"tax_$i"} = 0;
}
- ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+ my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
if ($taxkey > 1) {
if ($debitcredit) {
$debittax = 1;
}
}
- for $i (1 .. $count) {
- $j = $i - 1;
+ for my $i (1 .. $count) {
+ my $j = $i - 1;
for (@flds) { $form->{"${_}_$i"} = $a[$j]->{$_} }
}
- for $i ($count + 1 .. $form->{rowcount}) {
+ for my $i ($count + 1 .. $form->{rowcount}) {
for (@flds) { delete $form->{"${_}_$i"} }
}
$form->{rowcount} = $count + 1;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub display_form {
my ($init) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
&form_header($init);
# }
&display_rows($init);
&form_footer;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub display_rows {
my ($init) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $cgi = $main::cgi;
$form->{debit_1} = 0 if !$form->{"debit_1"};
$form->{totaldebit} = 0;
my %charts = ();
my $taxchart_init;
foreach my $item (@{ $form->{ALL_CHARTS} }) {
+ if ($item->{charttype} eq 'H'){ #falls überschrift
+ next; #überspringen (Bug 1150)
+ }
my $key = $item->{accno} . "--" . $item->{tax_id};
$taxchart_init = $item->{tax_id} unless (@chart_values);
push(@chart_values, $key);
$taxcharts{$item->{id}} = $item;
}
- for $i (1 .. $form->{rowcount}) {
+ my ($source, $memo, $source_hidden, $memo_hidden);
+ for my $i (1 .. $form->{rowcount}) {
if ($form->{show_details}) {
$source = qq|
<td><input name="source_$i" value="$form->{"source_$i"}" size="16"></td>|;
$selected_accno = '' if ($init);
$selected_taxchart ||= $taxchart_init;
- $accno = qq|<td>| .
+ my $accno = qq|<td>| .
NTI($cgi->popup_menu('-name' => "accno_$i",
'-id' => "accno_$i",
'-onChange' => "setTaxkey($i)",
. $cgi->hidden('-name' => "previous_accno_$i",
'-default' => $selected_accno_full)
. qq|</td>|;
- $tax = qq|<td>| .
+ my $tax_ddbox = qq|<td>| .
NTI($cgi->popup_menu('-name' => "taxchart_$i",
'-id' => "taxchart_$i",
'-style' => 'width:200px',
'-default' => $selected_taxchart))
. qq|</td>|;
+ my ($fx_transaction, $checked);
if ($init) {
if ($form->{transfer}) {
$fx_transaction = qq|
if ($i < $form->{rowcount}) {
if ($form->{transfer}) {
$checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
- $x = ($checked) ? "x" : "";
+ my $x = ($checked) ? "x" : "";
$fx_transaction = qq|
<td><input type=hidden name="fx_transaction_$i" value="$checked">$x</td>
|;
my $debitreadonly = "";
my $creditreadonly = "";
if ($i == $form->{rowcount}) {
- if ($debitlock) {
+ if ($form->{debitlock}) {
$debitreadonly = "readonly";
- } elsif ($creditlock) {
+ } elsif ($form->{creditlock}) {
$creditreadonly = "readonly";
}
}
'-values' => \@project_values,
'-labels' => \%project_labels,
'-default' => $form->{"project_id_$i"} ));
+ my $projectnumber_hidden = qq|
+ <input type="hidden" name="project_id_$i" value="$form->{"project_id_$i"}">|;
my $copy2credit = 'onkeyup="copy_debit_to_credit()"' if $i == 1;
<td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
<td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>
<td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
- $tax|;
+ $tax_ddbox|;
if ($form->{show_details}) {
print qq|
$memo
<td>$projectnumber</td>
|;
- }
+ } else {
print qq|
$source_hidden
$memo_hidden
+ $projectnumber_hidden
+ |;
+ }
+ print qq|
</tr>
|;
}
$form->hide_form(qw(rowcount selectaccno));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_header {
my ($init) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
my @old_project_ids = ();
map({ push(@old_project_ids, $form->{"project_id_$_"})
GL->get_chart_balances('charts' => $form->{ALL_CHARTS});
- $title = $form->{title};
+ my $title = $form->{title};
$form->{title} = $locale->text("$title General Ledger Transaction");
- $readonly = ($form->{id}) ? "readonly" : "";
+ my $readonly = ($form->{id}) ? "readonly" : "";
- $show_details_checked = "checked" if $form->{show_details};
+ my $show_details_checked = "checked" if $form->{show_details};
- $ob_transaction_checked = "checked" if $form->{ob_transaction};
- $cb_transaction_checked = "checked" if $form->{cb_transaction};
+ my $ob_transaction_checked = "checked" if $form->{ob_transaction};
+ my $cb_transaction_checked = "checked" if $form->{cb_transaction};
# $locale->text('Add General Ledger Transaction')
# $locale->text('Edit General Ledger Transaction')
$form->{selectdepartment} =~
s/option>\Q$form->{department}\E/option selected>$form->{department}/;
- if (($rows = $form->numtextrows($form->{description}, 50)) > 1) {
+ my $description;
+ if ((my $rows = $form->numtextrows($form->{description}, 50)) > 1) {
$description =
qq|<textarea name=description rows=$rows cols=50 wrap=soft $readonly >$form->{description}</textarea>|;
} else {
qq|<input name=description size=50 value="$form->{description}" $readonly>|;
}
- $taxincluded = ($form->{taxincluded}) ? "checked" : "";
+ my $taxincluded = ($form->{taxincluded}) ? "checked" : "";
if ($init) {
$taxincluded = "checked";
}
+ my $department;
$department = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
- </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+ <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+ <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
+ </tr>
| if $form->{selectdepartment};
if ($init) {
$form->{fokus} = "gl.reference";
# use JavaScript Calendar or not
$form->{jsscript} = 1;
- $jsscript = "";
+ my $jsscript = "";
+ my ($button1, $button2);
if ($form->{jsscript}) {
# with JavaScript Calendar
<table width=100%>
<tr>
<th class=listtop>$form->{title}</th>
- </tr>
+ </tr>| .
+
+ ($form->{saved_message} ? qq|
+ <tr>
+ <td>$form->{saved_message}</th>
+ </tr>| : '') .
+
+qq|
<tr height="5"></tr>
<tr>
<td>
. " $form->{previous_gldate}"
. qq|</td>
</tr>
- <tr>
- <th align=right>| . $locale->text('Reference') . qq|</th>
- <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
- <td align=left>
- <table>
- <tr>
- <th align=right nowrap>| . $locale->text('Date') . qq|</th>
+ <tr>
+ <th align=right>| . $locale->text('Reference') . qq|</th>
+ <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
+ <td align=left>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Date') . qq|</th>
$button1
- </tr>
- </table>
- </td>
- </tr>|;
+ </tr>
+ </table>
+ </td>
+ </tr>|;
if ($form->{id}) {
print qq|
- <tr>
- <th align=right>| . $locale->text('Belegnummer') . qq|</th>
- <td><input name=id size=20 value="$form->{id}" $readonly></td>
- <td align=left>
- <table>
- <tr>
- <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
- <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly onBlur=\"check_right_date_format(this)\"></td>
- </tr>
- </table>
- </td>
- </tr>|;
+ <tr>
+ <th align=right>| . $locale->text('Belegnummer') . qq|</th>
+ <td><input name=id size=20 value="$form->{id}" $readonly></td>
+ <td align=left>
+ <tr>
+ <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
+ <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly onBlur=\"check_right_date_format(this)\"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>|;
}
print qq|
- $department|;
+ $department|;
if ($form->{id}) {
print qq|
- <tr>
- <th align=right width=1%>| . $locale->text('Description') . qq|</th>
- <td width=1%>$description</td>
+ <tr>
+ <th align=right width=1%>| . $locale->text('Description') . qq|</th>
+ <td width=1%>$description</td>
<td>
- <table>
- <tr>
- <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
- <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
- </tr>
- </table>
- </td>
- <td align=left>
- <table width=100%>
- <tr>
- <th align=right width=50%>| . $locale->text('Mitarbeiter') . qq|</th>
- <td align=left><input name=employee size=20 value="| . H($form->{employee}) . qq|" readonly></td>
- </tr>
- </table>
- </td>
- </tr>|;
+ <tr>
+ <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+ <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
+ </tr>
+ </table>
+ </td>
+ <td align=left>
+ <tr>
+ <th align=right width=50%>| . $locale->text('Mitarbeiter') . qq|</th>
+ <td align=left><input name=employee size=20 value="| . H($form->{employee}) . qq|" readonly></td>
+ </tr>
+ </table>
+ </td>
+ </tr>|;
} else {
print qq|
- <tr>
- <th align=left width=1%>| . $locale->text('Description') . qq|</th>
- <td width=1%>$description</td>
- <td>
- <table>
- <tr>
- <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
- <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
- </tr>
- </table>
- </td>
- </tr>|;
+ <tr>
+ <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+ <td width=1%>$description</td>
+ <td>
+ <tr>
+ <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+ <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
+ </tr>
+ </table>
+ </td>
+ </tr>|;
}
print qq|
<tr>
<td colspan=4>
<table width=100%>
- <tr class=listheading>
- <th class=listheading style="width:15%">|
+ <tr class=listheading>
+ <th class=listheading style="width:15%">|
. $locale->text('Account') . qq|</th>
- <th class=listheading style="width:10%">| . $locale->text('Chart balance') . qq|</th>
- <th class=listheading style="width:10%">|
+ <th class=listheading style="width:10%">| . $locale->text('Chart balance') . qq|</th>
+ <th class=listheading style="width:10%">|
. $locale->text('Debit') . qq|</th>
- <th class=listheading style="width:10%">|
+ <th class=listheading style="width:10%">|
. $locale->text('Credit') . qq|</th>
<th class=listheading style="width:10%">|
. $locale->text('Tax') . qq|</th>
if ($form->{show_details}) {
print qq|
- <th class=listheading style="width:20%">| . $locale->text('Source') . qq|</th>
- <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
- <th class=listheading style="width:20%">| . $locale->text('Project Number') . qq|</th>
+ <th class=listheading style="width:20%">| . $locale->text('Source') . qq|</th>
+ <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
+ <th class=listheading style="width:20%">| . $locale->text('Project Number') . qq|</th>
|;
}
print qq|
- </tr>
+ </tr>
$jsscript
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_footer {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
my $follow_ups_block;
if ($form->{id}) {
}
}
- ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
+ my ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
$dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
- $radieren = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+ my $decimalplaces = ($dec > 2) ? $dec : 2;
+ my $radieren = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
map {
$form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, 2, " ")
<br>
|;
- $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
if ($form->{id}) {
print qq|<input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|">|;
}
- # Löschen und Ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich
+ # Löschen und Ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich
if (!$form->{locked} && $radieren) {
print qq|
<input class=submit type=submit name=action value="| . $locale->text('Post') . qq|" accesskey="b">
</body>
</html>
";
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub delete {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->header;
delete $form->{header};
- foreach $key (keys %$form) {
+ foreach my $key (keys %$form) {
next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
}
. $locale->text('Yes') . qq|">
</form>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub yes {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
if (GL->delete_transaction(\%myconfig, \%$form)){
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "DELETED";
+ $form->save_history;
}
# /saving the history
$form->redirect($locale->text('Transaction deleted!'))
}
$form->error($locale->text('Cannot delete transaction!'));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post_transaction {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
# check if there is something in reference and date
$form->isblank("reference", $locale->text('Reference missing!'));
$form->isblank("transdate", $locale->text('Transaction Date missing!'));
$form->isblank("description", $locale->text('Description missing!'));
- $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
my @a = ();
my $count = 0;
my $credittax = 0;
my $debitcount = 0;
my $creditcount = 0;
- $creditlock = 0;
- $debitlock = 0;
+ my $debitcredit;
my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
$form->{"credit_$i"} = 0;
$form->{"tax_$i"} = 0;
$creditcount--;
- $creditlock = 1;
+ $form->{creditlock} = 1;
}
if (($creditcount >= 2) && ($debitcount == 2)) {
$form->{"debit_$i"} = 0;
$form->{"tax_$i"} = 0;
$debitcount--;
- $debitlock = 1;
+ $form->{debitlock} = 1;
}
if (($creditcount == 1) && ($debitcount == 2)) {
- $creditlock = 1;
+ $form->{creditlock} = 1;
}
if (($creditcount == 2) && ($debitcount == 1)) {
- $debitlock = 1;
+ $form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
$form->{"taxchart_$i"} = "0--0.00";
if (!$debitcredit && $debittax) {
$form->{"taxchart_$i"} = "0--0.00";
}
- $amount = ($form->{"debit_$i"} == 0)
+ my $amount = ($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
: $form->{"debit_$i"};
- $j = $#a;
+ my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
$form->{"taxchart_$i"} = "0--0.00";
$form->{"tax_$i"} = 0;
}
- ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+ my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
if ($taxkey > 1) {
if ($debitcredit) {
$debittax = 1;
$count++;
}
- for $i (1 .. $count) {
- $j = $i - 1;
+ for my $i (1 .. $count) {
+ my $j = $i - 1;
for (@flds) { $form->{"${_}_$i"} = $a[$j]->{$_} }
}
- for $i ($count + 1 .. $form->{rowcount}) {
+ for my $i ($count + 1 .. $form->{rowcount}) {
for (@flds) { delete $form->{"${_}_$i"} }
}
- for $i (1 .. $form->{rowcount}) {
- $dr = $form->{"debit_$i"};
- $cr = $form->{"credit_$i"};
- $tax = $form->{"tax_$i"};
+ my ($debit, $credit, $taxtotal);
+ for my $i (1 .. $form->{rowcount}) {
+ my $dr = $form->{"debit_$i"};
+ my $cr = $form->{"credit_$i"};
+ my $tax = $form->{"tax_$i"};
if ($dr && $cr) {
$form->error($locale->text('Cannot post transaction with a debit and credit entry for the same account!'));
}
$form->error($locale->text('Empty transaction!'));
}
- if (($errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
+ if ((my $errno = GL->post_transaction(\%myconfig, \%$form)) <= -1) {
$errno *= -1;
+ my @err;
$err[1] = $locale->text('Cannot have a value in both Debit and Credit!');
$err[2] = $locale->text('Debit and credit out of balance!');
$err[3] = $locale->text('Cannot post a transaction without a value!');
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "SAVED";
$form->{what_done} = $locale->text("Buchungsnummer") . " = " . $form->{id};
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my $locale = $main::locale;
- $auth->assert('general_ledger');
+ if ($::myconfig{mandatory_departments} && !$form->{department}) {
+ $form->{saved_message} = $::locale->text('You have to specify a department.');
+ update();
+ exit;
+ }
$form->{title} = $locale->text("$form->{title} General Ledger Transaction");
$form->{storno} = 0;
remove_draft() if $form->{remove_draft};
- $form->{callback} = build_std_url("action=add", "show_details");
+ $form->{callback} = build_std_url("action=add&DONT_LOAD_DRAFT=1", "show_details");
$form->redirect($form->{callback});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub post_as_new {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
$form->{id} = 0;
&add;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub storno {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
# don't cancel cancelled transactions
if (IS->has_storno(\%myconfig, $form, 'gl')) {
if(!exists $form->{addition} && $form->{id} ne "") {
$form->{snumbers} = "ordnumber_$form->{ordnumber}";
$form->{addition} = "STORNO";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
$form->redirect(sprintf $locale->text("Transaction %d cancelled."), $form->{storno_id});
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub continue {
- call_sub($form->{nextsub});
+ call_sub($main::form->{nextsub});
}
+
+1;
projects / kivitendo-erp.git / blobdiff