sub save { call_sub("save_$form->{type}"); }
sub edit { call_sub("edit_$form->{type}"); }
sub continue { call_sub($form->{"nextsub"}); }
+sub save_as_new { call_sub("save_as_new_$form->{type}"); }
sub add_account {
$lxdebug->enter_sub();
if ( $form->{action} eq 'edit_account') {
$form->{account_exists} = '1';
- }
-
+ }
+
$form->{title} = $locale->text("$form->{title} Account");
$form->{"$form->{charttype}_checked"} = "checked";
$form->{select_tax} = "";
my @tax_report_pos = USTVA->report_variables({
- myconfig => \%myconfig,
- form => $form,
- type => '',
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
attribute => 'position',
calc => '',
});
if ($item->{id} == $taxkey_used->{tax_id}) {
$form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
qq|<option value="$item->{id}" selected="selected">|
- . sprintf("%.2d", $item->{taxkey})
+ . sprintf("%.2d", $item->{taxkey})
. qq|. $item->{taxdescription} ($item->{rate}) |
- . $locale->text('Tax-o-matic Account')
+ . $locale->text('Tax-o-matic Account')
. qq|: $item->{chart_accno}\n|;
- }
+ }
else {
$form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
qq|<option value="$item->{id}">|
- . sprintf("%.2d", $item->{taxkey})
+ . sprintf("%.2d", $item->{taxkey})
. qq|. $item->{taxdescription} ($item->{rate}) |
. $locale->text('Tax-o-matic Account')
. qq|: $item->{chart_accno}\n|;
}
}
-
+
# Fill in the USTVA Numbers as select options
foreach my $item ( '', sort({ $a cmp $b } @tax_report_pos) ) {
if ($item eq ''){
$form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="" selected="selected">-\n|;
- }
+ }
elsif ( $item eq $taxkey_used->{pos_ustva} ) {
$form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item" selected="selected">$item\n|;
}
$form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item">$item\n|;
}
- }
+ }
$i++;
}
}
- # Newaccount Folgekonto
+ # Newaccount Folgekonto
if (@{ $form->{NEWACCOUNT} }) {
if (!$form->{new_chart_valid}) {
$form->{selectnewaccount} = qq|<option value=""> |. $locale->text('None') .q|</option>|;
14 => "Steuern, Versich., Beiträge",
15 => "Kfz-Steuern",
16 => "Kfz-Versicherungen",
- 17 => "Sonst. Fahrtkosten",
+ 17 => "Sonst. Fahrzeugkosten",
18 => "Werbe- und Reisekosten",
19 => "Instandhaltung u. Werkzeuge",
20 => "Fachzeitschriften, Bücher",
# this is for our parser only! Do not remove.
# type=submit $locale->text('Add Account')
# type=submit $locale->text('Edit Account')
-
+
$form->{type} = "account";
# preselections category
-
+
$select_category = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
%category = (
'A' => $locale->text('Asset'),
'L' => $locale->text('Liability'),
'Q' => $locale->text('Equity'),
- 'I' => $locale->text('Revenue'),
+ 'I' => $locale->text('Revenue'),
'E' => $locale->text('Expense'),
'C' => $locale->text('Costs'),
);
}
}
-
+
# preselection chart type
my $select_charttype = q{};
'A' => $locale->text('Account'),
'H' => $locale->text('Header'),
);
-
+
foreach $item ( sort({ $a <=> $b } keys %charttype) ) {
if ($item eq $form->{charttype}) {
$select_charttype .= qq|<option value="$item" selected="selected">$charttype{$item}\n|;
}
my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
-
+
$form->header();
-
+
my $parameters_ref = {
ChartTypeIsAccount => $ChartTypeIsAccount,
select_category => $select_category,
select_bilanz => $select_bilanz,
select_eur => $select_eur,
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('am/edit_accounts', $parameters_ref));
. $locale->text('Delete') . qq|">|;
}
+ if ($form->{id} && $form->{type} eq "account") {
+ print qq|
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Save as new') . qq|">|;
+ }
+
print qq|
</form>
$form->isblank("accno", $locale->text('Account Number missing!'));
$form->isblank("description", $locale->text('Account Description missing!'));
-
+
if ($form->{charttype} eq 'A'){
$form->isblank("category", $locale->text('Account Type missing!'));
}
$lxdebug->leave_sub();
}
+sub save_as_new_account {
+ $lxdebug->enter_sub();
+
+ $auth->assert('config');
+
+ $form->isblank("accno", $locale->text('Account Number missing!'));
+ $form->isblank("description", $locale->text('Account Description missing!'));
+
+ if ($form->{charttype} eq 'A'){
+ $form->isblank("category", $locale->text('Account Type missing!'));
+ }
+
+ for my $taxkey (0 .. 9) {
+ if ($form->{"taxkey_id_$taxkey"}) {
+ $form->{"taxkey_id_$taxkey"} = "NEW";
+ }
+ }
+
+ $form->{id} = 0;
+ if ($form->{"original_accno"} &&
+ ($form->{"accno"} eq $form->{"original_accno"})) {
+ $form->error($locale->text('Account Number already used!'));
+ }
+ $form->redirect($locale->text('Account saved!'))
+ if (AM->save_account(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot save account!'));
+
+ $lxdebug->leave_sub();
+}
+
sub list_account {
$lxdebug->enter_sub();
if ($ca->{amount} < 0) {
$ca->{debit} = $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2);
}
- $ca->{heading} = ( $ca->{charttype} eq 'H' ) ? 1:'';
+ $ca->{heading} = ( $ca->{charttype} eq 'H' ) ? 1:'';
$ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
}
-
- # Ajax
+
+ # Ajax
my $pjx = new CGI::Ajax('list_account_details' => build_std_url('action=list_account_details'));
# Eneable AJAX debuging
#$pjx->DEBUG(1);
#$pjx->JSDEBUG(1);
-
+
push(@ { $form->{AJAX} }, $pjx);
$form->{stylesheets} = "list_accounts.css";
$form->{title} = $locale->text('Chart of Accounts');
$form->header;
-
-
+
+
my $parameters_ref = {
# hidden_variables => $_hidden_variables_ref,
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('am/list_accounts', $parameters_ref));
-
+
$lxdebug->leave_sub();
}
|;
$lead = $ref->{lead};
-
+
$column_data{description} = qq|<td><a href="am.pl?action=edit_lead&id=$ref->{id}&callback=$callback">$ref->{lead}</td>|;
map { print "$column_data{$_}\n" } @column_index;
<tr>
<th align=right>| . $locale->text('Skonto Terms') . qq|</th>
<td><input name=terms_skonto size=10 value="$form->{terms_skonto}"></td>
- </tr>
+ </tr>
<tr>
<th align=right>| . $locale->text('Skonto') . qq| %</th>
<td><input name=percent_skonto size=10 value="$form->{percent_skonto}"></td>
- </tr>
+ </tr>
<td colspan=2><hr size=3 noshade></td>
</tr>
</table>
# get defaults for account numbers and last numbers
AM->defaultaccounts(\%myconfig, \%$form);
+ $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g');
map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
%countrycodes = User->country_codes;
- $countrycodes{""} = "American English";
$form->{COUNTRYCODES} = [];
foreach $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
push @{ $form->{COUNTRYCODES} }, {
};
}
- $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
- $form->{"menustyle_$myconfig{menustyle}"} = 1;
- $form->{CAN_CHANGE_PASSWORD} = $auth->can_change_password();
- $form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
+ $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
+ $form->{CAN_CHANGE_PASSWORD} = $auth->can_change_password();
+ $form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
- $form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
+ $form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
$form->header();
print $form->parse_html_template('am/config');
TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
- $form->redirect($locale->text('Preferences saved!')) if (AM->save_preferences(\%myconfig, \%$form, $webdav));
+ $form->redirect($locale->text('Preferences saved!')) if (AM->save_preferences(\%myconfig, \%$form, 0));
$form->error($locale->text('Cannot save preferences!'));
$lxdebug->leave_sub();
AM->closedto(\%myconfig, \%$form);
- if ($form->{revtrans}) {
- $checked{Y} = "checked";
- } else {
- $checked{N} = "checked";
- }
-
$form->header;
print qq|
<tr>
<td>
<table>
- <tr>
- <td>|
- . $locale->text('Enforce transaction reversal for all dates') . qq|</th>
- <td><input name=revtrans class=radio type=radio value="1" $checked{Y}> |
- . $locale->text('Yes')
- . qq| <input name=revtrans class=radio type=radio value="0" $checked{N}> |
- . $locale->text('No')
- . qq|</td>
- </tr>
<tr>
<th>| . $locale->text('Close Books up to') . qq|</th>
<td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
AM->closebooks(\%myconfig, \%$form);
- if ($form->{revtrans}) {
+ if ($form->{closedto}) {
$form->redirect(
- $locale->text('Transaction reversal enforced for all dates'));
+ $locale->text('Books closed up to') . " "
+ . $locale->date(\%myconfig, $form->{closedto}, 1));
} else {
- if ($form->{closedto}) {
- $form->redirect(
- $locale->text('Transaction reversal enforced up to') . " "
- . $locale->date(\%myconfig, $form->{closedto}, 1));
- } else {
- $form->redirect($locale->text('Books are open'));
- }
+ $form->redirect($locale->text('Books are open'));
}
$lxdebug->leave_sub();
$auth->assert('config');
- $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}, "resolved_");
+ $units = AM->retrieve_units(\%myconfig, $form, "resolved_");
AM->units_in_use(\%myconfig, $form, $units);
map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
$i++;
}
- $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
+ $units = AM->retrieve_units(\%myconfig, $form);
$ddbox = AM->unit_select_data($units, undef, 1);
- my $updownlink = build_std_url("action=swap_units", "unit_type");
+ my $updownlink = build_std_url("action=swap_units");
- $form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
+ $form->{"title"} = $locale->text("Add and edit units");
$form->header();
print($form->parse_html_template("am/edit_units",
{ "UNITS" => \@unit_list,
$auth->assert('config');
$form->isblank("new_name", $locale->text("The name is missing."));
- $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
+ $units = AM->retrieve_units(\%myconfig, $form);
$all_units = AM->retrieve_units(\%myconfig, $form);
$form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($all_units->{$form->{"new_name"}});
});
}
- AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"}, \@languages);
+ AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, \@languages);
$form->{"saved_message"} = $locale->text("The unit has been saved.");
$auth->assert('config');
- $old_units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}, "resolved_");
+ $old_units = AM->retrieve_units(\%myconfig, $form, "resolved_");
AM->units_in_use(\%myconfig, $form, $old_units);
@languages = AM->language(\%myconfig, $form, 1);
}
}
- AM->save_units(\%myconfig, $form, $form->{"unit_type"}, $new_units, \@delete_units);
+ AM->save_units(\%myconfig, $form, $new_units, \@delete_units);
$form->{"saved_message"} = $locale->text("The units have been saved.");
}
sub show_history_search {
- $lxdebug->enter_sub();
-
+ $lxdebug->enter_sub();
+
$auth->assert('config');
- $form->{title} = $locale->text("History Search");
- $form->header();
-
- print $form->parse_html_template("common/search_history");
-
- $lxdebug->leave_sub();
+ $form->{title} = $locale->text("History Search");
+ $form->header();
+
+ print $form->parse_html_template("common/search_history");
+
+ $lxdebug->leave_sub();
}
sub show_am_history {
- $lxdebug->enter_sub();
-
- $auth->assert('config');
-
- my %search = ( "Artikelnummer" => "parts",
- "Kundennummer" => "customer",
- "Lieferantennummer" => "vendor",
- "Projektnummer" => "project",
- "Buchungsnummer" => "oe",
- "Eingangsrechnungnummer" => "ap",
- "Ausgangsrechnungnummer" => "ar",
- "Mahnungsnummer" => "dunning"
- );
- my %searchNo = ( "Artikelnummer" => "partnumber",
- "Kundennummer" => "customernumber",
- "Lieferantennummer" => "vendornumber",
- "Projektnummer" => "projectnummer",
- "Buchungsnummer" => "ordnumber",
- "Eingangsrechnungnummer" => "invnumber",
- "Ausgangsrechnungnummer" => "invnumber",
- "Mahnungsnummer" => "dunning_id"
- );
-
- my $restriction;
- my $tempNo = 0;
- foreach(split(/\,/, $form->{einschraenkungen})) {
- if($tempNo == 0) {
- $restriction .= " AND addition = '" . $_ . "'";
- $tempNo = 1;
- }
- else {
- $restriction .= " OR addition = '" . $_ . "'";
- }
- }
- $restriction .= (($form->{transdate} ne "" && $form->{reqdate} ne "")
- ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
- : (($form->{transdate} ne "" && $form->{reqdate} eq "")
- ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
- : ($form->{transdate} eq "" && $form->{reqdate} ne "")
- ? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
- : ""
- )
- );
- $restriction .= ($form->{mitarbeiter} eq "" ? ""
- : ($form->{mitarbeiter} =~ /^[0-9]*$/
- ? " AND employee_id = " . $form->{mitarbeiter}
- : " AND employee_id = " . &get_employee_id($form->{mitarbeiter}, $dbh)));
-
- my $dbh = $form->dbconnect(\%myconfig);
- my $query = qq|SELECT trans_id AS id FROM history_erp | .
- ($form->{'searchid'} ?
- qq| WHERE snumbers = '| . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'| :
- qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
-
- my $sth = $dbh->prepare($query);
-
- $sth->execute() || $form->dberror($query);
-
- $form->{title} = $locale->text("History Search");
- $form->header();
-
- my $i = 1;
- my $daten = qq||;
- while(my $hash_ref = $sth->fetchrow_hashref()){
- if($i) {
- $daten .= $hash_ref->{id};
- $i = 0;
- }
- else {
- $daten .= " OR trans_id = " . $hash_ref->{id};
- }
+ $lxdebug->enter_sub();
+
+ $auth->assert('config');
+
+ my $callback = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
+ $form->{order} ||= 'h.itime--1';
+
+ my %search = ( "Artikelnummer" => "parts",
+ "Kundennummer" => "customer",
+ "Lieferantennummer" => "vendor",
+ "Projektnummer" => "project",
+ "Buchungsnummer" => "oe",
+ "Eingangsrechnungnummer" => "ap",
+ "Ausgangsrechnungnummer" => "ar",
+ "Mahnungsnummer" => "dunning"
+ );
+ my %searchNo = ( "Artikelnummer" => "partnumber",
+ "Kundennummer" => "customernumber",
+ "Lieferantennummer" => "vendornumber",
+ "Projektnummer" => "projectnummer",
+ "Buchungsnummer" => "ordnumber",
+ "Eingangsrechnungnummer" => "invnumber",
+ "Ausgangsrechnungnummer" => "invnumber",
+ "Mahnungsnummer" => "dunning_id"
+ );
+
+ my $dbh = $form->dbconnect(\%myconfig);
+
+ my $restriction = qq| AND (| . join(' OR ', map { " addition = " . $dbh->quote($_) } split(m/\,/, $form->{einschraenkungen})) . qq|)| if $form->{einschraenkungen};
+ $restriction .= qq| AND h.itime::date >= | . conv_dateq($form->{fromdate}) if $form->{fromdate};
+ $restriction .= qq| AND h.itime::date <= | . conv_dateq($form->{todate}) if $form->{todate};
+ if ($form->{mitarbeiter} =~ m/^\d+$/) {
+ $restriction .= qq| AND employee_id = | . $form->{mitarbeiter};
+ } elsif ($form->{mitarbeiter}) {
+ $restriction .= qq| AND employee_id = (SELECT id FROM employee WHERE name ILIKE | . $dbh->quote('%' . $form->{mitarbeiter} . '%') . qq|)|;
}
-
+
+ my $query = qq|SELECT trans_id AS id FROM history_erp | .
+ ( $form->{'searchid'} ? qq| WHERE snumbers = '| . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
+ : qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
+
+ my @ids = grep { $_ * 1 } selectall_array_query($form, $dbh, $query);
+ my $daten .= shift @ids;
+ $daten .= join '', map { " OR trans_id = $_" } @ids;
+
my ($sort, $sortby) = split(/\-\-/, $form->{order});
$sort =~ s/.*\.(.*)$/$1/;
- print $form->parse_html_template("common/show_history",
- {"DATEN" => $form->get_history($dbh, $daten, $restriction, $form->{order}),
- "SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
- "NONEWWINDOW" => 1,
- uc($sort) => 1,
- uc($sort)."BY" => $sortby
- });
- $dbh->disconnect();
- $lxdebug->leave_sub();
-}
-
-sub get_employee_id {
- $lxdebug->enter_sub();
+ $form->{title} = $locale->text("History Search");
+ $form->header();
- $auth->assert('config');
+ print $form->parse_html_template("common/show_history",
+ { "DATEN" => $form->get_history($dbh, $daten, $restriction, $form->{order}),
+ "SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
+ "NONEWWINDOW" => 1,
+ uc($sort) => 1,
+ uc($sort) . "BY" => $sortby,
+ 'callback' => $callback,
+ });
+ $dbh->disconnect();
- my $query = qq|SELECT id FROM employee WHERE name = '| . $_[0] . qq|'|;
- my $sth = $_[1]->prepare($query);
- $sth->execute() || $form->dberror($query);
- my $return = $sth->fetch();
- $sth->finish();
- return ${$return}[0];
- $lxdebug->leave_sub();
+ $lxdebug->leave_sub();
}
sub swap_units {
$auth->assert('config');
my $dir = $form->{"dir"} eq "down" ? "down" : "up";
- my $unit_type = $form->{"unit_type"} eq "dimension" ?
- "dimension" : "service";
- AM->swap_units(\%myconfig, $form, $dir, $form->{"name"}, $unit_type);
+ AM->swap_units(\%myconfig, $form, $dir, $form->{"name"});
edit_units();
_get_taxaccount_selection();
$form->header();
-
+
my $parameters_ref = {
# ChartTypeIsAccount => $ChartTypeIsAccount,
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('am/edit_tax', $parameters_ref));
$form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
$form->header();
-
+
my $parameters_ref = {
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('am/edit_tax', $parameters_ref));
$form->{title} = $locale->text('Tax-O-Matic');
$form->header();
-
+
# Ausgabe des Templates
print($form->parse_html_template('am/list_tax', $parameters_ref));
if ( $form->{rate} <= 0.99 && $form->{rate} > 0 ) {
$form->error($locale->text('Tax Percent is a number between 0 and 100'));
- }
+ }
AM->save_tax(\%myconfig, \%$form);
$form->redirect($locale->text('Tax saved!'));
$lxdebug->leave_sub();
}
-