use SL::CA;
use SL::Form;
use SL::User;
+use SL::USTVA;
+use SL::Iconv;
+use CGI::Ajax;
+use CGI;
use Data::Dumper;
1;
-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";
# end of main
AM->get_account(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&account_header;
sub account_header {
$lxdebug->enter_sub();
+ if ( $form->{action} eq 'edit_account') {
+ $form->{account_exists} = '1';
+ }
+
$form->{title} = $locale->text("$form->{title} Account");
- $checked{ $form->{charttype} } = "checked";
- $checked{"$form->{category}_"} = "checked";
- $checked{CT_tax} = ($form->{CT_tax}) ? "" : "checked";
+ $form->{"$form->{charttype}_checked"} = "checked";
+ $form->{"$form->{category}_checked"} = "checked";
- $form->{description} =~ s/\"/"/g;
+ $form->{select_tax} = "";
+
+ my @tax_report_pos = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ calc => '',
+ });
if (@{ $form->{TAXKEY} }) {
foreach my $item (@{ $form->{TAXKEY} }) {
-
$item->{rate} = $item->{rate} * 100 . '%';
+ }
- if ($item->{tax} == $form->{tax}) {
- $form->{selecttaxkey} .=
- "<option value=$item->{tax} selected>$item->{taxdescription} ($item->{rate})\n";
- } else {
- $form->{selecttaxkey} .=
- "<option value=$item->{tax}>$item->{taxdescription} ($item->{rate})\n";
- }
+ # Fill in empty row for new Taxkey
+ $newtaxkey_ref = {
+ id => '',
+ chart_id => '',
+ accno => '',
+ tax_id => '',
+ taxdescription => '',
+ rate => '',
+ taxkey_id => '',
+ pos_ustva => '',
+ startdate => '',
+ };
+
+ push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
+
+ my $i = 0;
+ foreach my $taxkey_used (@{ $form->{ACCOUNT_TAXKEYS} } ) {
+
+ # Fill in a runningnumber
+ $form->{ACCOUNT_TAXKEYS}[$i]{runningnumber} = $i;
+
+ # Fill in the Taxkeys as select options
+ foreach my $item (@{ $form->{TAXKEY} }) {
+ if ($item->{id} == $taxkey_used->{tax_id}) {
+ $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
+ qq|<option value="$item->{id}" selected="selected">|
+ . sprintf("%.2d", $item->{taxkey})
+ . qq|. $item->{taxdescription} ($item->{rate}) |
+ . $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})
+ . 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 == $taxkey_used->{pos_ustva} ) {
+ $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item" selected="selected">$item\n|;
+ }
+ else {
+ $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item">$item\n|;
+ }
+
+ }
+
+ $i++;
}
}
- $taxkey = qq|
- <tr>
- <th align=right>| . $locale->text('Steuersatz') . qq|</th>
- <td><select name=tax>$form->{selecttaxkey}</select></td>
- <th align=right>| . $locale->text('Gültig ab') . qq|</th>
- <td><input name=startdate value="$form->{startdate}"></td>
- </tr>|;
-
+ # Newaccount Folgekonto
if (@{ $form->{NEWACCOUNT} }) {
if (!$form->{new_chart_valid}) {
- $form->{selectnewaccount} = "<option value=></option>";
+ $form->{selectnewaccount} = qq|<option value=""> |. $locale->text('None') .q|</option>|;
}
foreach $item (@{ $form->{NEWACCOUNT} }) {
if ($item->{id} == $form->{new_chart_id}) {
$form->{selectnewaccount} .=
- "<option value=$item->{id} selected>$item->{accno}--$item->{description}</option>";
+ qq|<option value="$item->{id}" selected>$item->{accno}--$item->{description}</option>|;
} elsif (!$form->{new_chart_valid}) {
$form->{selectnewaccount} .=
- "<option value=$item->{id}>$item->{accno}--$item->{description}</option>";
+ qq|<option value="$item->{id}">$item->{accno}--$item->{description}</option>|;
}
}
}
- $newaccount = qq|
- <tr>
- <td colspan=2>
- <table>
- <tr>
- <th align=right>| . $locale->text('Folgekonto') . qq|</th>
- <td><select name=new_chart_id>$form->{selectnewaccount}</select></td>
- <th align=right>| . $locale->text('Gültig ab') . qq|</th>
- <td><input name=valid_from value="$form->{valid_from}"></td>
- </tr>
- </table>
- </td>
- </tr>|;
-
- $form->{selectustva} = "<option>\n";
-
- %ustva = (35 => $locale->text('UStVA-Nr. 35'),
- 36 => $locale->text('UStVA-Nr. 36'),
- 39 => $locale->text('UStVA-Nr. 39'),
- 41 => $locale->text('UStVA-Nr. 41'),
- 42 => $locale->text('UStVA-Nr. 42'),
- 43 => $locale->text('UStVA-Nr. 43'),
- 44 => $locale->text('UStVA-Nr. 44'),
- 45 => $locale->text('UStVA-Nr. 45'),
- 48 => $locale->text('UStVA-Nr. 48'),
- 49 => $locale->text('UStVA-Nr. 49'),
- 51 => $locale->text('UStVA-Nr. 51 left'),
- 511 => $locale->text('UStVA-Nr. 51 right'),
- 52 => $locale->text('UStVA-Nr. 52'),
- 53 => $locale->text('UStVA-Nr. 53'),
- 59 => $locale->text('UStVA-Nr. 59'),
- 60 => $locale->text('UStVA-Nr. 60'),
- 61 => $locale->text('UStVA-Nr. 61'),
- 62 => $locale->text('UStVA-Nr. 62'),
- 63 => $locale->text('UStVA-Nr. 63'),
- 64 => $locale->text('UStVA-Nr. 64'),
- 65 => $locale->text('UStVA-Nr. 65'),
- 66 => $locale->text('UStVA-Nr. 66'),
- 67 => $locale->text('UStVA-Nr. 67'),
- 69 => $locale->text('UStVA-Nr. 69'),
- 73 => $locale->text('UStVA-Nr. 73'),
- 74 => $locale->text('UStVA-Nr. 74'),
- 76 => $locale->text('UStVA-Nr. 76'),
- 77 => $locale->text('UStVA-Nr. 77'),
- 80 => $locale->text('UStVA-Nr. 80'),
- 81 => $locale->text('UStVA-Nr. 81 left'),
- 811 => $locale->text('UStVA-Nr. 81 right'),
- 84 => $locale->text('UStVA-Nr. 84'),
- 85 => $locale->text('UStVA-Nr. 85'),
- 86 => $locale->text('UStVA-Nr. 86 left'),
- 861 => $locale->text('UStVA-Nr. 86 right'),
- 89 => $locale->text('UStVA-Nr. 89 left'),
- 891 => $locale->text('UStVA-Nr. 89 right'),
- 91 => $locale->text('UStVA-Nr. 91'),
- 93 => $locale->text('UStVA-Nr. 93 left'),
- 931 => $locale->text('UStVA-Nr. 93 right'),
- 94 => $locale->text('UStVA-Nr. 94'),
- 95 => $locale->text('UStVA-Nr. 95'),
- 96 => $locale->text('UStVA-Nr. 96'),
- 97 => $locale->text('UStVA-Nr. 97 links'),
- 971 => $locale->text('UStVA-Nr. 97 rechts'),
- 98 => $locale->text('UStVA-Nr. 98'));
-
- foreach $item (sort({ $a cmp $b } keys %ustva)) {
- if ($item == $form->{pos_ustva}) {
- $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
- } else {
- $form->{selectustva} .= "<option value=$item>$ustva{$item}\n";
- }
-
- }
-
- $ustva = qq|
- <tr>
- <th align=right>| . $locale->text('Umsatzsteuervoranmeldung') . qq|</th>
- <td><select name=pos_ustva>$form->{selectustva}</select></td>
- <input type=hidden name=selectustva value="$form->{selectustva}">
- </tr>|;
-
- $form->{selecteur} = "<option>\n";
+ $select_eur = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
%eur = (1 => "Umsatzerlöse",
2 => "sonstige Erlöse",
3 => "Privatanteile",
30 => "Ausserordentlicher Aufwand",
31 => "Betriebliche Steuern");
foreach $item (sort({ $a <=> $b } keys(%eur))) {
+ my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $eur{$item}));
if ($item == $form->{pos_eur}) {
- $form->{selecteur} .= "<option value=$item selected>$eur{$item}\n";
+ $select_eur .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
} else {
- $form->{selecteur} .= "<option value=$item>$eur{$item}\n";
+ $select_eur .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
}
}
- $eur = qq|
- <tr>
- <th align=right>| . $locale->text('EUER') . qq|</th>
- <td><select name=pos_eur>$form->{selecteur}</select></td>
- <input type=hidden name=selecteur value="$form->{selecteur}">
- </tr>|;
-
- $form->{selectbwa} = "<option>\n";
+ $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
%bwapos = (1 => 'Umsatzerlöse',
2 => 'Best.Verdg.FE/UE',
34 => 'Verr.kalk.Kosten',
35 => 'Steuern Eink.u.Ertr.');
foreach $item (sort({ $a <=> $b } keys %bwapos)) {
+ my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $bwapos{$item}));
if ($item == $form->{pos_bwa}) {
- $form->{selectbwa} .= "<option value=$item selected>$bwapos{$item}\n";
+ $select_bwa .= qq|<option value="$item" selected>|. sprintf("%.2d", $item) .qq|. $text\n|;
} else {
- $form->{selectbwa} .= "<option value=$item>$bwapos{$item}\n";
+ $select_bwa .= qq|<option value="$item">|. sprintf("%.2d", $item) .qq|. $text\n|;
}
}
- $bwa = qq|
- <tr>
- <th align=right>| . $locale->text('BWA') . qq|</th>
- <td><select name=pos_bwa>$form->{selectbwa}</select></td>
- <input type=hidden name=selectbwa value="$form->{selectbwa}">
- </tr>|;
+# Wieder hinzugefügt zu evaluationszwecken (us) 09.03.2007
+ $select_bilanz = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+ foreach $item ((1, 2, 3, 4)) {
+ if ($item == $form->{pos_bilanz}) {
+ $select_bilanz .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|.\n|;
+ } else {
+ $select_bilanz .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|.\n|;
+ }
-# Entfernt bis es ordentlich umgesetzt wird (hli) 30.03.2006
-# $form->{selectbilanz} = "<option>\n";
-# foreach $item ((1, 2, 3, 4)) {
-# if ($item == $form->{pos_bilanz}) {
-# $form->{selectbilanz} .= "<option value=$item selected>$item\n";
-# } else {
-# $form->{selectbilanz} .= "<option value=$item>$item\n";
-# }
-#
-# }
-#
-# $bilanz = qq|
-# <tr>
-# <th align=right>| . $locale->text('Bilanz') . qq|</th>
-# <td><select name=pos_bilanz>$form->{selectbilanz}</select></td>
-# <input type=hidden name=selectbilanz value="$form->{selectbilanz}">
-# </tr>|;
-
- # this is for our parser only!
+ }
+
+ # this is for our parser only! Do not remove.
# type=submit $locale->text('Add Account')
# type=submit $locale->text('Edit Account')
+
$form->{type} = "account";
- $form->header;
-
- print qq|
-<body>
-
-<form method=post action=$form->{script}>
+ # 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'),
+ 'E' => $locale->text('Expense'),
+ 'C' => $locale->text('Costs'),
+ );
+ foreach $item ( sort({ $a <=> $b } keys %category) ) {
+ if ($item eq $form->{category}) {
+ $select_category .= qq|<option value="$item" selected="selected">$category{$item} (|. sprintf("%s", $item) .qq|)\n|;
+ } else {
+ $select_category .= qq|<option value="$item">$category{$item} (|. sprintf("%s", $item) .qq|)\n|;
+ }
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=account>
-<input type=hidden name=orphaned value=$form->{orphaned}>
-<input type=hidden name=new_chart_valid value=$form->{new_chart_valid}>
+ }
+
+ # preselection chart type
+ my $select_charttype = q{};
-<input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>
-<input type=hidden name=income_accno_id value=$form->{income_accno_id}>
-<input type=hidden name=expense_accno_id value=$form->{expense_accno_id}>
-<input type=hidden name=fxgain_accno_id value=$form->{fxgain_accno_id}>
-<input type=hidden name=fxloss_accno_id value=$form->{fxloss_accno_id}>
+ my %charttype = (
+ '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|;
-<table border=0 width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr valign=top>
- <td>
- <table>
- <tr>
- <th align=right>| . $locale->text('Account Number') . qq|</th>
- <td><input name=accno size=20 value=$form->{accno}></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Description') . qq|</th>
- <td><input name=description size=40 value="$form->{description}"></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Account Type') . qq|</th>
- <td>
- <table>
- <tr valign=top>
- <td><input name=category type=radio class=radio value=A $checked{A_}> |
- . $locale->text('Asset') . qq|\n<br>
- <input name=category type=radio class=radio value=L $checked{L_}> |
- . $locale->text('Liability') . qq|\n<br>
- <input name=category type=radio class=radio value=Q $checked{Q_}> |
- . $locale->text('Equity') . qq|\n<br>
- <input name=category type=radio class=radio value=I $checked{I_}> |
- . $locale->text('Revenue') . qq|\n<br>
- <input name=category type=radio class=radio value=E $checked{E_}> |
- . $locale->text('Expense') . qq|<br>
- <input name=category type=radio class=radio value=C $checked{C_}> |
- . $locale->text('Costs') . qq|</td>
- <td width=50> </td>
- <td>
- <input name=charttype type=radio class=radio value="H" $checked{H}> |
- . $locale->text('Heading') . qq|<br>
- <input name=charttype type=radio class=radio value="A" $checked{A}> |
- . $locale->text('Account') . qq|</td>
- </tr>
- </table>
- </td>
- </tr>
-|;
+ } else {
+ $select_charttype .= qq|<option value="$item">$charttype{$item}\n|;
+ }
- if ($form->{charttype} eq "A") {
- print qq|
- <tr>
- <td colspan=2>
- <table>
- <tr>
- <th align=left>|
- . $locale->text('Is this a summary account to record') . qq|</th>
- <td>
- <input name=AR type=checkbox class=checkbox value=AR $form->{AR}> |
- . $locale->text('AR')
- . qq| <input name=AP type=checkbox class=checkbox value=AP $form->{AP}> |
- . $locale->text('AP')
- . qq| <input name=IC type=checkbox class=checkbox value=IC $form->{IC}> |
- . $locale->text('Inventory')
- . qq|</td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <th colspan=2>| . $locale->text('Include in drop-down menus') . qq|</th>
- </tr>
- <tr valign=top>
- <td colspan=2>
- <table width=100%>
- <tr>
- <th align=left>| . $locale->text('Receivables') . qq|</th>
- <th align=left>| . $locale->text('Payables') . qq|</th>
- <th align=left>| . $locale->text('Parts Inventory') . qq|</th>
- <th align=left>| . $locale->text('Service Items') . qq|</th>
- </tr>
- <tr>
- <td>
- <input name=AR_amount type=checkbox class=checkbox value=AR_amount $form->{AR_amount}> |
- . $locale->text('Revenue') . qq|\n<br>
- <input name=AR_paid type=checkbox class=checkbox value=AR_paid $form->{AR_paid}> |
- . $locale->text('Receipt') . qq|\n<br>
- <input name=AR_tax type=checkbox class=checkbox value=AR_tax $form->{AR_tax}> |
- . $locale->text('Tax') . qq|
- </td>
- <td>
- <input name=AP_amount type=checkbox class=checkbox value=AP_amount $form->{AP_amount}> |
- . $locale->text('Expense/Asset') . qq|\n<br>
- <input name=AP_paid type=checkbox class=checkbox value=AP_paid $form->{AP_paid}> |
- . $locale->text('Payment') . qq|\n<br>
- <input name=AP_tax type=checkbox class=checkbox value=AP_tax $form->{AP_tax}> |
- . $locale->text('Tax') . qq|
- </td>
- <td>
- <input name=IC_sale type=checkbox class=checkbox value=IC_sale $form->{IC_sale}> |
- . $locale->text('Revenue') . qq|\n<br>
- <input name=IC_cogs type=checkbox class=checkbox value=IC_cogs $form->{IC_cogs}> |
- . $locale->text('Expense') . qq|\n<br>
- <input name=IC_taxpart type=checkbox class=checkbox value=IC_taxpart $form->{IC_taxpart}> |
- . $locale->text('Tax') . qq|
- </td>
- <td>
- <input name=IC_income type=checkbox class=checkbox value=IC_income $form->{IC_income}> |
- . $locale->text('Revenue') . qq|\n<br>
- <input name=IC_expense type=checkbox class=checkbox value=IC_expense $form->{IC_expense}> |
- . $locale->text('Expense') . qq|\n<br>
- <input name=IC_taxservice type=checkbox class=checkbox value=IC_taxservice $form->{IC_taxservice}> |
- . $locale->text('Tax') . qq|
- </td>
- </tr>
- </table>
- </td>
- </tr>
-|;
}
- print qq|
- $taxkey
- $ustva
- $eur
- $bwa
- $bilanz
- </table>
- </td>
- </tr>
- $newaccount
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-|;
+ my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
+
+ $form->header();
+
+ my $parameters_ref = {
+ ChartTypeIsAccount => $ChartTypeIsAccount,
+ select_category => $select_category,
+ select_charttype => $select_charttype,
+ newaccount => $newaccount,
+ checked => $checked,
+ select_bwa => $select_bwa,
+ select_bilanz => $select_bilanz,
+ select_eur => $select_eur,
+ };
+
+ # Ausgabe des Templates
+ print($form->parse_html_template('am/edit_accounts', $parameters_ref));
+
$lxdebug->leave_sub();
}
<input name=callback type=hidden value="$form->{callback}">
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
sub save_account {
$lxdebug->enter_sub();
- $form->isblank("accno", $locale->text('Account Number missing!'));
- $form->isblank("category", $locale->text('Account Type missing!'));
+ $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!'));
+ }
$form->redirect($locale->text('Account saved!'))
if (AM->save_account(\%myconfig, \%$form));
$form->{title} = $locale->text('Chart of Accounts');
+ # construct callback
+ $callback =
+ "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}";
+
+
+
+ # escape callback
+ $callback = $form->escape($callback);
+
+ foreach $ca (@{ $form->{CA} }) {
+
+ $ca->{debit} = " ";
+ $ca->{credit} = " ";
+
+ if ($ca->{amount} > 0) {
+ $ca->{credit} =
+ $form->format_amount(\%myconfig, $ca->{amount}, 2, " ");
+ }
+ if ($ca->{amount} < 0) {
+ $ca->{debit} =
+ $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2, " ");
+ }
+ $ca->{heading} = ( $ca->{charttype} eq 'H' ) ? 1:'';
+ $ca->{link_edit_account} =
+ qq|$form->{script}?action=edit_account&id=$ca->{id}|
+ .qq|&path=$form->{path}&login=$form->{login}|
+ .qq|&password=$form->{password}&callback=$callback|;
+ }
+
+ # Ajax
+ my $list_account_details_url =
+ "$form->{script}?login=$form->{login}&path=$form->{path}"
+ ."&password=$form->{password}&action=list_account_details&";
+
+
+ my $pjx = new CGI::Ajax(
+ 'list_account_details' => $list_account_details_url
+ );
+
+ # Eneable AJAX debuging
+ #$pjx->DEBUG(1);
+ #$pjx->JSDEBUG(1);
+
+ push(@ { $form->{AJAX} }, $pjx);
+
+ $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();
+
+}
+
+
+sub list_account_details {
+# Ajax Funktion aus list_account_details
+ $lxdebug->enter_sub();
+
+ my $chart_id = $form->{args};
+
+ CA->all_accounts(\%myconfig, \%$form, $chart_id);
+
+ $form->{title} = $locale->text('Chart of Accounts');
+
# construct callback
$callback =
"$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}";
}
if ($ca->{amount} < 0) {
$ca->{debit} =
- $form->format_amount(\%myconfig, -$ca->{amount}, 2, " ");
+ $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2, " ");
}
my @links = split( q{:}, $ca->{link});
: ( $link eq 'IC_income' ) ? $locale->text('Account Link IC_income')
: ( $link eq 'IC_expense' ) ? $locale->text('Account Link IC_expense')
: ( $link eq 'IC_taxservice' ) ? $locale->text('Account Link IC_taxservice')
- : ( $link eq 'CT_tax' ) ? $locale->text('Account Link CT_tax')
+# : ( $link eq 'CT_tax' ) ? $locale->text('Account Link CT_tax')
: $locale->text('Unknown Link') . ': ' . $link;
- $ca->{link} .= qq|[| . $link . qq|] |;
+ $ca->{link} .= ($link ne '') ? "[$link] ":'';
}
$ca->{startdate} =~ s/,/<br>/og;
$ca->{taxkey} =~ s/,/<br>/og;
$ca->{taxaccount} =~ s/,/<br>/og;
$ca->{taxdescription} =~ s/,/<br>/og;
- $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):q{};
+ $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):$locale->text('Off');
$ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
: ($ca->{category} eq 'E') ? $locale->text('Account Category E')
$ca->{link_edit_account} =
qq|$form->{script}?action=edit_account&id=$ca->{id}|
- .qq|&path=$form->{path}&login=$form->{login}|
+ .qq|&login=$form->{login}|
.qq|&password=$form->{password}&callback=$callback|;
}
-
+
+
+
+
my $parameters_ref = {
};
# Ausgabe des Templates
- print($form->parse_html_template('am/list_accounts', $parameters_ref));
+ #my $q = CGI->new();
+ my $result = $form->parse_html_template('am/list_account_details', $parameters_ref);
+ print $result;
+# print "chart_id:$chart_id, form->chartid:$form->{chart_id}, rest=$rest";
+
$lxdebug->leave_sub();
-
}
$form->{role} = "P";
$form->{callback} =
- "$form->{script}?action=add_department&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_department&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&department_header;
AM->departments(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_department&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_department&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
$profitcenter = ($ref->{role} eq "P") ? "X" : "";
$column_data{description} =
- qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+ qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
$column_data{cost} = qq|<td align=center>$costcenter</td>|;
$column_data{profit} = qq|<td align=center>$profitcenter</td>|;
<input type=hidden name=type value=department>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_lead&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&lead_header;
AM->lead(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_lead&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
$lead = $ref->{lead};
$column_data{description} =
- qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;
+ qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;
map { print "$column_data{$_}\n" } @column_index;
<input type=hidden name=type value=lead>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_business&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&business_header;
AM->business(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_business&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
$description =
$ref->{description};
$column_data{description} =
- qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description</td>|;
+ qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$description</td>|;
$column_data{discount} = qq|<td align=right>$discount</td>|;
$column_data{customernumberinit} =
qq|<td align=right>$ref->{customernumberinit}</td>|;
<input type=hidden name=type value=business>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_language&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&language_header;
AM->language(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_language&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
$column_data{description} =
- qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+ qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
$column_data{template_code} = qq|<td align=right>$ref->{template_code}</td>|;
$column_data{article_code} =
qq|<td align=right>$ref->{article_code}</td>|;
<input type=hidden name=type value=language>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_buchungsgruppe&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
AM->get_buchungsgruppe(\%myconfig, \%$form);
$form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
AM->buchungsgruppe(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_buchungsgruppe&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
. qq|</th>|;
$column_header{income_accno_0} =
qq|<th class=listheading>|
- . $locale->text('Erlöse Inland')
+ . $locale->text('National Revenues')
. qq|</th>|;
$column_header{expense_accno_0} =
qq|<th class=listheading>|
- . $locale->text('Aufwand Inland')
+ . $locale->text('National Expenses')
. qq|</th>|;
$column_header{income_accno_1} =
qq|<th class=listheading>|
- . $locale->text('Erlöse EU m. UStId')
+ . $locale->text('Revenues EU with UStId')
. qq|</th>|;
$column_header{expense_accno_1} =
qq|<th class=listheading>|
- . $locale->text('Aufwand EU m. UStId')
+ . $locale->text('Expenses EU with UStId')
. qq|</th>|;
$column_header{income_accno_2} =
qq|<th class=listheading>|
- . $locale->text('Erlöse EU o. UStId')
+ . $locale->text('Revenues EU without UStId')
. qq|</th>|;
$column_header{expense_accno_2} =
qq|<th class=listheading>|
- . $locale->text('Aufwand EU o. UStId')
+ . $locale->text('Expenses EU without UStId')
. qq|</th>|;
$column_header{income_accno_3} =
qq|<th class=listheading>|
- . $locale->text('Erlöse Ausland')
+ . $locale->text('Foreign Revenues')
. qq|</th>|;
$column_header{expense_accno_3} =
qq|<th class=listheading>|
- . $locale->text('Aufwand Ausland')
+ . $locale->text('Foreign Expenses')
. qq|</th>|;
$form->header;
my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|;
map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" }
- qw(login password path));
+ qw(login password));
my $row = 0;
foreach $ref (@{ $form->{ALL} }) {
}
$column_data{description} =
- qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+ qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
$column_data{inventory_accno} = qq|<td align=right>$ref->{inventory_accno}</td>|;
$column_data{income_accno_0} =
qq|<td align=right>$ref->{income_accno_0}</td>|;
<input type=hidden name=type value=buchungsgruppe>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
$form->{title} = $locale->text("$form->{title} Buchungsgruppe");
- # $locale->text('Buchungsgruppe hinzufügen')
- # $locale->text('Buchungsgruppe bearbeiten')
+ # $locale->text('Add Accounting Group')
+ # $locale->text('Edit Accounting Group')
my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
my %acc_type_map = (
$linkaccounts .= qq|
<tr>
- <th align=right>| . $locale->text('Erlöse Inland') . qq|</th>
+ <th align=right>| . $locale->text('National Revenues') . qq|</th>
<td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
</tr>
<tr>
- <th align=right>| . $locale->text('Aufwand Inland') . qq|</th>
+ <th align=right>| . $locale->text('National Expenses') . qq|</th>
<td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
</tr>|;
if ($form->{id}) {
$form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/ value=$form->{expense_accno_id_1} selected/;
}
$linkaccounts .= qq| <tr>
- <th align=right>| . $locale->text('Erlöse EU m. UStId') . qq|</th>
+ <th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
<td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
</tr>
<tr>
- <th align=right>| . $locale->text('Aufwand EU m UStId') . qq|</th>
+ <th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
<td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
</tr>|;
}
$linkaccounts .= qq| <tr>
- <th align=right>| . $locale->text('Erlöse EU o. UStId') . qq|</th>
+ <th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
<td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
</tr>
<tr>
- <th align=right>| . $locale->text('Aufwand EU o. UStId') . qq|</th>
+ <th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
<td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
</tr>|;
}
$linkaccounts .= qq| <tr>
- <th align=right>| . $locale->text('Erlöse Ausland') . qq|</th>
+ <th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
<td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
</tr>
<tr>
- <th align=right>| . $locale->text('Aufwand Ausland') . qq|</th>
+ <th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
<td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
</tr>
|;
$form->isblank("description", $locale->text('Description missing!'));
AM->save_buchungsgruppe(\%myconfig, \%$form);
- $form->redirect($locale->text('Buchungsgruppe gespeichert!'));
+ $form->redirect($locale->text('Accounting Group saved!'));
$lxdebug->leave_sub();
}
$lxdebug->enter_sub();
AM->delete_buchungsgruppe(\%myconfig, \%$form);
- $form->redirect($locale->text('Buchungsgruppe gelöscht!'));
+ $form->redirect($locale->text('Accounting Group deleted!'));
$lxdebug->leave_sub();
}
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_printer&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&printer_header;
AM->printer(\%myconfig, \%$form);
$form->{callback} =
- "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ "$form->{script}?action=list_printer&login=$form->{login}&password=$form->{password}";
$callback = $form->escape($form->{callback});
$column_data{printer_description} =
- qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}</td>|;
+ qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}</td>|;
$column_data{printer_command} = qq|<td align=right>$ref->{printer_command}</td>|;
$column_data{template_code} =
qq|<td align=right>$ref->{template_code}</td>|;
<input type=hidden name=type value=printer>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
$form->{title} = "Add";
$form->{callback} =
- "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=add_payment&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
$form->{terms_netto} = 0;
<input type=hidden name=type value=payment>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
</tr>
</table>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<form method=post action=$form->{script}>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
"Projektnummer" => "project",
"Buchungsnummer" => "oe",
"Eingangsrechnungnummer" => "ap",
- "Ausgangsrechnungnummer" => "ar"
+ "Ausgangsrechnungnummer" => "ar",
+ "Mahnungsnummer" => "dunning"
);
my %searchNo = ( "Artikelnummer" => "partnumber",
"Kundennummer" => "customernumber",
"Projektnummer" => "projectnummer",
"Buchungsnummer" => "ordnumber",
"Eingangsrechnungnummer" => "invnumber",
- "Ausgangsrechnungnummer" => "invnumber"
+ "Ausgangsrechnungnummer" => "invnumber",
+ "Mahnungsnummer" => "dunning_id"
);
my $restriction;
$sth->execute() || $form->dberror($query);
$form->{title} = $locale->text("History Search");
$form->header();
- my @daten;
+ my $daten = "";
while(my $hash_ref = $sth->fetchrow_hashref()){
- push(@daten, $form->get_history($dbh,$hash_ref->{id},$restriction));
+ $daten = $form->get_history($dbh,$hash_ref->{id},$restriction);
}
$dbh->disconnect();
print $form->parse_html_template("/common/show_history",
- {"DATEN" => @daten,
- "SUCCESS" => (length(@daten) > 0),
+ {"DATEN" => $daten,
+ "SUCCESS" => ($daten != 0 ? 1 : 0),
"NONEWWINDOW" => 1
});
$lxdebug->leave_sub();