1;
+require "$form->{path}/common.pl";
+
# end of main
sub add { &{"add_$form->{type}"} }
$form->{description} =~ s/\"/"/g;
if (@{ $form->{TAXKEY} }) {
- $form->{selecttaxkey} = "<option value=0>Keine Steuer 0%\n";
foreach $item (@{ $form->{TAXKEY} }) {
- if ($item->{taxkey} == $form->{taxkey_id}) {
+ if ($item->{tax} == $form->{tax}) {
$form->{selecttaxkey} .=
- "<option value=$item->{taxkey} selected>$item->{taxdescription}\n";
+ "<option value=$item->{tax} selected>$item->{taxdescription}\n";
} else {
$form->{selecttaxkey} .=
- "<option value=$item->{taxkey}>$item->{taxdescription}\n";
+ "<option value=$item->{tax}>$item->{taxdescription}\n";
}
}
$taxkey = qq|
<tr>
<th align=right>| . $locale->text('Steuersatz') . qq|</th>
- <td><select name=taxkey_id>$form->{selecttaxkey}</select></td>
- <input type=hidden name=selecttaxkey value="$form->{selecttaxkey}">
+ <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>|;
if (@{ $form->{NEWACCOUNT} }) {
<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|</td>
+ . $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}> |
$form->{title} = $locale->text('Languages');
- @column_index = qw(description template_code article_code);
+ @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
$column_header{description} =
qq|<th class=listheading width=60%>|
qq|<th class=listheading>|
. $locale->text('Article Code')
. qq|</th>|;
+ $column_header{output_numberformat} =
+ qq|<th class=listheading>|
+ . $locale->text('Number Format')
+ . qq|</th>|;
+ $column_header{output_dateformat} =
+ qq|<th class=listheading>|
+ . $locale->text('Date Format')
+ . qq|</th>|;
+ $column_header{output_longdates} =
+ qq|<th class=listheading>|
+ . $locale->text('Long Dates')
+ . qq|</th>|;
$form->header;
$column_data{template_code} = qq|<td align=right>$ref->{template_code}</td>|;
$column_data{article_code} =
qq|<td align=right>$ref->{article_code}</td>|;
+ $column_data{output_numberformat} =
+ "<td nowrap>" .
+ ($ref->{output_numberformat} ? $ref->{output_numberformat} :
+ $locale->text("use program settings")) .
+ "</td>";
+ $column_data{output_dateformat} =
+ "<td nowrap>" .
+ ($ref->{output_dateformat} ? $ref->{output_dateformat} :
+ $locale->text("use program settings")) .
+ "</td>";
+ $column_data{output_longdates} =
+ "<td nowrap>" .
+ ($ref->{output_longdates} ? $locale->text("Yes") : $locale->text("No")) .
+ "</td>";
map { print "$column_data{$_}\n" } @column_index;
$form->header;
+ my $numberformat =
+ qq|<option value="">| . $locale->text("use program settings") .
+ qq|</option>|;
+ foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) {
+ $numberformat .=
+ ($item eq $form->{output_numberformat})
+ ? "<option selected>$item"
+ : "<option>$item"
+ . "</option>";
+ }
+
+ my $dateformat =
+ qq|<option value="">| . $locale->text("use program settings") .
+ qq|</option>|;
+ foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
+ $dateformat .=
+ ($item eq $form->{output_dateformat})
+ ? "<option selected>$item"
+ : "<option>$item"
+ . "</option>";
+ }
+
print qq|
<body>
<tr height="5"></tr>
<tr>
<th align=right>| . $locale->text('Language') . qq|</th>
- <td><input name=description size=30 value="$form->{description}"></td>
+ <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
<tr>
<tr>
<th align=right>| . $locale->text('Template Code') . qq|</th>
- <td><input name=template_code size=5 value=$form->{template_code}></td>
+ <td><input name=template_code size=5 value="| . $form->quote($form->{template_code}) . qq|"></td>
</tr>
<tr>
<th align=right>| . $locale->text('Article Code') . qq|</th>
- <td><input name=article_code size=10 value=$form->{article_code}></td>
+ <td><input name=article_code size=10 value="| . $form->quote($form->{article_code}) . qq|"></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Number Format') . qq|</th>
+ <td><select name="output_numberformat">$numberformat</select></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Date Format') . qq|</th>
+ <td><select name="output_dateformat">$dateformat</select></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Long Dates') . qq|</th>
+ <td><input type="radio" name="output_longdates" value="1"| .
+ ($form->{output_longdates} ? " checked" : "") .
+ qq|>| . $locale->text("Yes") .
+ qq|<input type="radio" name="output_longdates" value="0"| .
+ ($form->{output_longdates} ? "" : " checked") .
+ qq|>| . $locale->text("No") .
+ qq|</td>
</tr>
<td colspan=2><hr size=3 noshade></td>
</tr>
"$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
AM->get_buchungsgruppe(\%myconfig, \%$form);
+ $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
+ for (my $i = 0; 4 > $i; $i++) {
+ map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
+ qw(income expense));
+ }
&buchungsgruppe_header;
&form_footer;
. qq|</th>|;
$column_header{income_accno_1} =
qq|<th class=listheading>|
- . $locale->text('Erlöse EU o. UStId')
+ . $locale->text('Erlöse EU m. UStId')
. qq|</th>|;
$column_header{expense_accno_1} =
qq|<th class=listheading>|
- . $locale->text('Aufwand EU o. UStId')
+ . $locale->text('Aufwand EU m. UStId')
. qq|</th>|;
$column_header{income_accno_2} =
qq|<th class=listheading>|
- . $locale->text('Erlöse EU m. UStId')
+ . $locale->text('Erlöse EU o. UStId')
. qq|</th>|;
$column_header{expense_accno_2} =
qq|<th class=listheading>|
- . $locale->text('Aufwand EU m. UStId')
+ . $locale->text('Aufwand EU o. UStId')
. qq|</th>|;
$column_header{income_accno_3} =
qq|<th class=listheading>|
# $locale->text('Buchungsgruppe hinzufügen')
# $locale->text('Buchungsgruppe bearbeiten')
- $form->{description} =~ s/\"/"/g;
+ my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
+ my %acc_type_map = (
+ "IC" => $acc_inventory,
+ "IC_income" => $acc_income,
+ "IC_sale" => $acc_income,
+ "IC_expense" => $acc_expense,
+ "IC_cogs" => $acc_expense,
+ );
- # build the popup menus
- $form->{taxaccounts} = "";
- foreach $key (keys %{ $form->{IC_links} }) {
+ foreach $key (keys(%acc_type_map)) {
foreach $ref (@{ $form->{IC_links}{$key} }) {
-
- # if this is a tax field
- if ($key =~ /IC_tax/) {
- if ($key =~ /$item/) {
- $form->{taxaccounts} .= "$ref->{accno} ";
- $form->{"IC_tax_$ref->{accno}_description"} =
- "$ref->{accno}--$ref->{description}";
-
- if ($form->{id}) {
- if ($form->{amount}{ $ref->{accno} }) {
- $form->{"IC_tax_$ref->{accno}"} = "checked";
- }
- } else {
- $form->{"IC_tax_$ref->{accno}"} = "checked";
- }
- }
- } else {
-
- $form->{"select$key"} .=
- "<option value=$ref->{id} $ref->{selected}>$ref->{accno}--$ref->{description}\n";
- if (($key eq "IC") && ($ref->{selected} eq "selected")) {
- $form->{IC_default} = $ref->{id};
- }
- if ($form->{amount}{$key} eq $ref->{accno}) {
- $form->{$key} = "$ref->{accno}--$ref->{description}";
- }
-
- }
+ $acc_type_map{$key}->{$ref->{"id"}} = $ref;
}
}
- $form->{selectIC_income} = $form->{selectIC_sale};
- $form->{selectIC_expense} = $form->{selectIC_cogs};
- $form->{IC_income} = $form->{IC_sale};
- $form->{IC_expense} = $form->{IC_cogs};
+
+ foreach my $type (qw(IC IC_income IC_expense)) {
+ $form->{"select$type"} =
+ join("",
+ map({ "<option value=$_->{id} $_->{selected}>" .
+ "$_->{accno}--" . H($_->{description}) . "</option>" }
+ sort({ $a->{"accno"} cmp $b->{"accno"} }
+ values(%{$acc_type_map{$type}}))));
+ }
if ($form->{id}) {
$form->{selectIC} =~ s/selected//g;
} else {
$linkaccounts = qq|
<input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>|;
- }
+ }
- $linkaccounts .= qq|
+ $linkaccounts .= qq|
<tr>
<th align=right>| . $locale->text('Erlöse Inland') . qq|</th>
<td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
<tr height="5"></tr>
<tr>
<th align=right>| . $locale->text('Buchungsgruppe') . qq|</th>
- <td><input name=description size=30 value="$form->{description}"></td>
+ <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
<tr>
$linkaccounts
<td colspan=2><hr size=3 noshade></td>
"$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
+ $form->{terms_netto} = 0;
+ $form->{terms_skonto} = 0;
+ $form->{percent_skonto} = 0;
&payment_header;
&form_footer;
<input name=callback type=hidden value="$form->{callback}">
-<input type=hidden name=type value=business>
+<input type=hidden name=type value=payment>
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<th align=right>| . $locale->text('Description') . qq|</th>
<td><input name=description size=30 value="$form->{description}"></td>
<tr>
- <tr>
- <th align=right>| . $locale->text('Ranking') . qq|</th>
- <td><input name=ranking size=30 value="$form->{ranking}"></td>
- <tr>
<tr>
<th align=right>| . $locale->text('Long Description') . qq|</th>
<td><input name=description_long size=50 value="$form->{description_long}"></td>
$myconfig{$item} =~ s/\\n/\r\n/g;
}
+ @formats = ();
+ if ($opendocument_templates && $openofficeorg_writer_bin &&
+ $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
+ push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"),
+ "value" => "opendocument_pdf" });
+ }
+ if ($latex_templates) {
+ push(@formats, { "name" => $locale->text("PDF"), "value" => "pdf" });
+ }
+ push(@formats, { "name" => "HTML", "value" => "html" });
+ if ($latex_templates) {
+ push(@formats, { "name" => $locale->text("Postscript"),
+ "value" => "postscript" });
+ }
+ if ($opendocument_templates) {
+ push(@formats, { "name" => $locale->text("OpenDocument/OASIS"),
+ "value" => "opendocument" });
+ }
+
+ if (!$myconfig{"template_format"}) {
+ $myconfig{"template_format"} = "pdf";
+ }
+ $template_format = "";
+ foreach $item (@formats) {
+ $template_format .=
+ "<option value=\"$item->{value}\"" .
+ ($item->{"value"} eq $myconfig{"template_format"} ?
+ " selected" : "") .
+ ">" . H($item->{"name"}) . "</option>";
+ }
+
%countrycodes = User->country_codes;
$countrycodes = '';
foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
$form->header;
- if ($myconfig{menustyle} eq "old") { $oldS = "checked"; }
- else { $newS = "checked"; }
+ if ($myconfig{menustyle} eq "old") {
+ $menustyle_old = "checked";
+ } elsif ($myconfig{menustyle} eq "neu") {
+ $menustyle_neu = "checked";
+ } elsif ($myconfig{menustyle} eq "v3") {
+ $menustyle_v3 = "checked";
+ }
print qq|
<body>
</tr>
<tr>
<th align=right>| . $locale->text('Setup Menu') . qq|</th>
- <td><input name=menustyle type=radio class=radio value=neu $newS> New
- <input name=menustyle type=radio class=radio value=old $oldS> Old</td>
+ <td><input name=menustyle type=radio class=radio value=v3 $menustyle_v3> | .
+ $locale->text("Top (CSS)") . qq|
+ <input name=menustyle type=radio class=radio value=neu $menustyle_neu> | .
+ $locale->text("Top (Javascript)") . qq|
+ <input name=menustyle type=radio class=radio value=old $menustyle_old> | .
+ $locale->text("Old (on the side)") . qq|</td>
</tr>
<input name=printer type=hidden value="$myconfig{printer}">
+ <tr class=listheading>
+ <th colspan=2>| . $locale->text("Print options") . qq|</th>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Default template format') . qq|</th>
+ <td><select name="template_format">$template_format</select></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Number of copies') . qq|</th>
+ <td><input name="copies" size="10" value="| .
+ $form->quote($myconfig{"copies"}) . qq|"></td>
+ </tr>
+
+
<tr class=listheading>
<th colspan=2> </th>
</tr>
<td><input name=businessnumber size=25 value="$myconfig{businessnumber}"></td>
</tr>
<tr>
- <td colspan=2>
- <table width=100%>
- <tr>
<th align=right>| . $locale->text('Year End') . qq| (mm/dd)</th>
<td><input name=yearend size=5 value=$form->{defaults}{yearend}></td>
- <th align=right>| . $locale->text('Weight Unit') . qq|</th>
- <td><input name=weightunit size=5 value="$form->{defaults}{weightunit}"></td>
- </tr>
- </table>
- </td>
</tr>
<tr class=listheading>
<th colspan=2>|
</tr>
</table>
</td>
- </tr>
- <tr class=listheading>
- <th colspan=2>| . $locale->text('Tax Accounts') . qq|</th>
- </tr>
- <tr>
- <td colspan=2>
- <tr>
- <th> </th>
- <th>| . $locale->text('Rate') . qq| (%)</th>
- <th>| . $locale->text('Number') . qq|</th>
- </tr>
-|;
-
- foreach $accno (sort keys %{ $form->{taxrates} }) {
- print qq|
- <tr>
- <th align=right>$form->{taxrates}{$accno}{description}</th>
- <td><input name=$form->{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}></td>
- <td><input name="taxnumber_$form->{taxrates}{$accno}{id}" value="$form->{taxrates}{$accno}{taxnumber}"></td>
- </tr>
-|;
- $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} ";
- }
-
- chop $form->{taxaccounts};
-
- print qq|
-<input name=taxaccounts type=hidden value="$form->{taxaccounts}">
-
- </table>
- </td>
- </tr>
- </table>
+ </tr>|;
+# <tr class=listheading>
+# <th colspan=2>| . $locale->text('Tax Accounts') . qq|</th>
+# </tr>
+# <tr>
+# <td colspan=2>
+# <tr>
+# <th> </th>
+# <th>| . $locale->text('Rate') . qq| (%)</th>
+# <th>| . $locale->text('Number') . qq|</th>
+# </tr>
+# |;
+#
+# foreach $accno (sort keys %{ $form->{taxrates} }) {
+# print qq|
+# <tr>
+# <th align=right>$form->{taxrates}{$accno}{description}</th>
+# <td><input name=$form->{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}></td>
+# <td><input name="taxnumber_$form->{taxrates}{$accno}{id}" value="$form->{taxrates}{$accno}{taxnumber}"></td>
+# </tr>
+# |;
+# $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} ";
+# }
+#
+# chop $form->{taxaccounts};
+#
+# print qq|
+# <input name=taxaccounts type=hidden value="$form->{taxaccounts}">
+#
+# </table>
+# </td>
+# </tr>
+print qq| </table>
</td>
</tr>
<tr>
AM->units_in_use(\%myconfig, $form, $units);
map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
+ @languages = AM->language(\%myconfig, $form, 1);
+
@unit_list = ();
foreach $name (sort({ lc($a) cmp lc($b) } grep({ !$units->{$_}->{"base_unit"} } keys(%{$units})))) {
map({ push(@unit_list, $units->{$_}); }
sort({ ($units->{$a}->{"resolved_factor"} * 1) <=> ($units->{$b}->{"resolved_factor"} * 1) }
grep({ $units->{$_}->{"resolved_base_unit"} eq $name } keys(%{$units}))));
}
- map({ $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"}); } @unit_list);
+ my $i = 1;
+ foreach (@unit_list) {
+ $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"});
+ $_->{"UNITLANGUAGES"} = [];
+ foreach my $lang (@languages) {
+ push(@{ $_->{"UNITLANGUAGES"} },
+ { "idx" => $i,
+ "unit" => $_->{"name"},
+ "language_id" => $lang->{"id"},
+ "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
+ "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
+ });
+ }
+ $i++;
+ }
$units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
$ddbox = AM->unit_select_data($units, undef, 1);
$form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
$form->header();
- print($form->parse_html_template("am/edit_units", { "UNITS" => \@unit_list, "NEW_BASE_UNIT_DDBOX" => $ddbox }));
+ print($form->parse_html_template("am/edit_units",
+ { "UNITS" => \@unit_list,
+ "NEW_BASE_UNIT_DDBOX" => $ddbox,
+ "LANGUAGES" => \@languages }));
$lxdebug->leave_sub();
}
$form->isblank("new_name", $locale->text("The name is missing."));
$units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
- $form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($units->{$form->{"new_name"}});
+ $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"}});
my ($base_unit, $factor);
if ($form->{"new_base_unit"}) {
$base_unit = $form->{"new_base_unit"};
}
- AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"});
+ my @languages;
+ foreach my $lang (AM->language(\%myconfig, $form, 1)) {
+ next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
+ push(@languages, { "id" => $lang->{"id"},
+ "localized" => $form->{"new_localized_$lang->{id}"},
+ "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
+ });
+ }
+
+ AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"}, \@languages);
$form->{"saved_message"} = $locale->text("The unit has been saved.");
$lxdebug->leave_sub();
}
+sub set_unit_languages {
+ $lxdebug->enter_sub();
+
+ my ($unit, $languages, $idx) = @_;
+
+ $unit->{"LANGUAGES"} = [];
+
+ foreach my $lang (@{$languages}) {
+ push(@{ $unit->{"LANGUAGES"} },
+ { "id" => $lang->{"id"},
+ "localized" => $form->{"localized_${idx}_$lang->{id}"},
+ "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
+ });
+ }
+
+ $lxdebug->leave_sub();
+}
+
sub save_unit {
$lxdebug->enter_sub();
$old_units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}, "resolved_");
AM->units_in_use(\%myconfig, $form, $old_units);
+ @languages = AM->language(\%myconfig, $form, 1);
+
$new_units = {};
@delete_units = ();
foreach $i (1..($form->{"rowcount"} * 1)) {
if ($form->{"unchangeable_$i"}) {
$new_units->{$form->{"old_name_$i"}} = $old_units->{$form->{"old_name_$i"}};
$new_units->{$form->{"old_name_$i"}}->{"unchanged_unit"} = 1;
+ set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
next;
}
my %h = map({ $_ => $form->{"${_}_$i"} } qw(name base_unit factor old_name));
$new_units->{$form->{"name_$i"}} = \%h;
$new_units->{$form->{"name_$i"}}->{"row"} = $i;
+ set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
}
foreach $unit (values(%{$new_units})) {
projects / kivitendo-erp.git / blobdiff