- |.$locale->text('Department').qq| |
+ | . $locale->text('Department') . qq| |
|
@@ -247,27 +266,33 @@ sub form_header {
# use JavaScript Calendar or not
$form->{jsscript} = $form->{jscalendar};
$jsscript = "";
- if ($form->{jsscript})
- {
+ if ($form->{jsscript}) {
+
# with JavaScript Calendar
$button1 = qq|
{invdate}> |
- text('button').qq|> |
+ text('button') . qq|> |
|;
- $button2 = qq|
+ $button2 = qq|
{duedate}> |
- text('button').qq|> |
+ text('button') . qq|> |
|;
- #write Trigger
- $jsscript = Form->write_trigger(\%myconfig,"2","invdate","BL","trigger1","duedate","BL","trigger2");
- }
- else
- {
- # without JavaScript Calendar
- $button1 = qq|{invdate}> | |;
- $button2 = qq|{duedate}> | |;
- }
-
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
+ "duedate", "BL", "trigger2");
+ } else {
+
+ # without JavaScript Calendar
+ $button1 =
+ qq|{invdate}> | |;
+ $button2 =
+ qq|{duedate}> | |;
+ }
+
$form->header;
print qq|
@@ -279,6 +304,7 @@ sub form_header {
{type}>
+{level}>
{creditlimit}>
{creditremaining}>
@@ -301,12 +327,13 @@ sub form_header {
- |.$locale->text('Vendor').qq| |
+ | . $locale->text('Vendor') . qq| |
$vendor |
-
- |.$locale->text('Contact Person').qq| |
+
+ |
+ . $locale->text('Contact Person') . qq| |
$contact |
-
+
{vendor_id}>
@@ -316,22 +343,22 @@ sub form_header {
- |.$locale->text('Credit Limit').qq| |
+ | . $locale->text('Credit Limit') . qq| |
$form->{creditlimit} |
|
- |.$locale->text('Remaining').qq| |
+ | . $locale->text('Remaining') . qq| |
$form->{creditremaining} |
|
- |.$locale->text('Record in').qq| |
+ | . $locale->text('Record in') . qq| |
|
$department
- |.$locale->text('Currency').qq| |
+ | . $locale->text('Currency') . qq| |
|
$exchangerate
@@ -340,19 +367,19 @@ sub form_header {
- |.$locale->text('Invoice Number').qq| |
+ | . $locale->text('Invoice Number') . qq| |
|
- |.$locale->text('Invoice Date').qq| |
+ | . $locale->text('Invoice Date') . qq| |
$button1
- |.$locale->text('Due Date').qq| |
+ | . $locale->text('Due Date') . qq| |
$button2
- |.$locale->text('Order Number').qq| |
+ | . $locale->text('Order Number') . qq| |
|
@@ -364,7 +391,7 @@ sub form_header {
$jsscript
-
+
{defaultcurrency}>
{fxgain_accno}>
@@ -387,13 +414,11 @@ $jsscript
$lxdebug->leave_sub();
}
-
-
sub form_footer {
$lxdebug->enter_sub();
$form->{invtotal} = $form->{invsubtotal};
-
+
if (($rows = $form->numtextrows($form->{notes}, 25, 8)) < 2) {
$rows = 2;
}
@@ -401,26 +426,33 @@ sub form_footer {
$introws = 2;
}
$rows = ($rows > $introws) ? $rows : $introws;
- $notes = qq||;
- $intnotes = qq||;
-
+ $notes =
+ qq||;
+ $intnotes =
+ qq||;
+
$form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
$taxincluded = "";
if ($form->{taxaccounts}) {
$taxincluded = qq|
- {taxincluded}> |.$locale->text('Tax Included').qq|
+ {taxincluded}> |
+ . $locale->text('Tax Included') . qq|
|;
}
-
+
if (!$form->{taxincluded}) {
-
+
foreach $item (split / /, $form->{taxaccounts}) {
if ($form->{"${item}_base"}) {
- $form->{invtotal} += $form->{"${item}_total"} = $form->round_amount($form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
- $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-
- $tax .= qq|
+ $form->{invtotal} += $form->{"${item}_total"} =
+ $form->round_amount(
+ $form->{"${item}_base"} * $form->{"${item}_rate"},
+ 2);
+ $form->{"${item}_total"} =
+ $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
+
+ $tax .= qq|
$form->{"${item}_description"} |
$form->{"${item}_total"} |
@@ -428,30 +460,40 @@ sub form_footer {
|;
}
}
-
+ $form->{invsubtotal} =
+ $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
- $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
-
$subtotal = qq|
- |.$locale->text('Subtotal').qq| |
+ | . $locale->text('Subtotal') . qq| |
$form->{invsubtotal} |
|;
}
-
+
if ($form->{taxincluded}) {
- foreach $item (split / /, $form->{taxaccounts}) {
- if ($form->{"${item}_base"}) {
- $form->{"${item}_total"} = $form->round_amount(($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})) , 2);
- $form->{"${item}_base"} = $form->round_amount($form->{"${item}_base"}, 2);
- $form->{"${item}_netto"} = $form->round_amount(($form->{"${item}_base"}-$form->{"${item}_total"}), 2);
- $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
- $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-
- $tax .= qq|
+ foreach $item (split / /, $form->{taxaccounts}) {
+ if ($form->{"${item}_base"}) {
+ $form->{"${item}_total"} =
+ $form->round_amount(
+ ($form->{"${item}_base"} * $form->{"${item}_rate"} /
+ (1 + $form->{"${item}_rate"})
+ ),
+ 2);
+ $form->{"${item}_base"} =
+ $form->round_amount($form->{"${item}_base"}, 2);
+ $form->{"${item}_netto"} =
+ $form->round_amount(
+ ($form->{"${item}_base"} - $form->{"${item}_total"}),
+ 2);
+ $form->{"${item}_netto"} =
+ $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
+ $form->{"${item}_total"} =
+ $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
+
+ $tax .= qq|
Enthaltene $form->{"${item}_description"} |
$form->{"${item}_total"} |
@@ -463,12 +505,12 @@ sub form_footer {
|;
}
}
-
-
+
}
- $form->{oldinvtotal} = $form->{invtotal};
- $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
+ $form->{oldinvtotal} = $form->{invtotal};
+ $form->{invtotal} =
+ $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
print qq|
@@ -478,8 +520,8 @@ sub form_footer {
- |.$locale->text('Notes').qq| |
- |.$locale->text('Internal Notes').qq| |
+ | . $locale->text('Notes') . qq| |
+ | . $locale->text('Internal Notes') . qq| |
$notes |
@@ -494,7 +536,7 @@ sub form_footer {
$subtotal
$tax
0
- |.$locale->text('Total').qq| |
+ | . $locale->text('Total') . qq| |
$form->{invtotal} |
@@ -505,106 +547,116 @@ sub form_footer {
|
|;
if ($webdav) {
- $webdav_list = qq|
+ $webdav_list = qq|
|
-
+
Dokumente im Webdav-Repository |
Dateiname |
Webdavlink |
|;
- foreach $file (keys %{ $form->{WEBDAV}}) {
- $webdav_list .= qq|
-
+ foreach $file (keys %{ $form->{WEBDAV} }) {
+ $webdav_list .= qq|
+
$file |
$form->{WEBDAV}{$file} |
|;
- }
- $webdav_list .= qq|
+ }
+ $webdav_list .= qq|
|;
-print $webdav_list;
-}
-print qq|
+ print $webdav_list;
+ }
+ print qq|
{jscalendar}>
|;
-print qq|
+ print qq|
- |.$locale->text('Payments').qq| |
+ | . $locale->text('Payments') . qq| |
|;
- if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AP_paid);
- } else {
- @column_index = qw(datepaid source memo paid exchangerate AP_paid);
- }
+ if ($form->{currency} eq $form->{defaultcurrency}) {
+ @column_index = qw(datepaid source memo paid AP_paid);
+ } else {
+ @column_index = qw(datepaid source memo paid exchangerate AP_paid);
+ }
- $column_data{datepaid} = "".$locale->text('Date')." | ";
- $column_data{paid} = "".$locale->text('Amount')." | ";
- $column_data{exchangerate} = "".$locale->text('Exch')." | ";
- $column_data{AP_paid} = "".$locale->text('Account')." | ";
- $column_data{source} = "".$locale->text('Source')." | ";
- $column_data{memo} = "".$locale->text('Memo')." | ";
+ $column_data{datepaid} = "" . $locale->text('Date') . " | ";
+ $column_data{paid} = "" . $locale->text('Amount') . " | ";
+ $column_data{exchangerate} = "" . $locale->text('Exch') . " | ";
+ $column_data{AP_paid} = "" . $locale->text('Account') . " | ";
+ $column_data{source} = "" . $locale->text('Source') . " | ";
+ $column_data{memo} = "" . $locale->text('Memo') . " | ";
- print qq|
+ print qq|
|;
- map { print "$column_data{$_}\n" } @column_index;
- print qq|
+ map { print "$column_data{$_}\n" } @column_index;
+ print qq|
|;
- $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
- for $i (1 .. $form->{paidaccounts}) {
+ $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
+ for $i (1 .. $form->{paidaccounts}) {
- print qq|
+ print qq|
|;
- $form->{"selectAP_paid_$i"} = $form->{selectAP_paid};
- $form->{"selectAP_paid_$i"} =~ s/option>\Q$form->{"AP_paid_$i"}\E/option selected>$form->{"AP_paid_$i"}/;
-
- # format amounts
- $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
- $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-
- $exchangerate = qq| |;
- if ($form->{currency} ne $form->{defaultcurrency}) {
- if ($form->{"forex_$i"}) {
- $exchangerate = qq|{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
- } else {
- $exchangerate = qq|{"exchangerate_$i"}>|;
- }
+ $form->{"selectAP_paid_$i"} = $form->{selectAP_paid};
+ $form->{"selectAP_paid_$i"} =~
+ s/option>\Q$form->{"AP_paid_$i"}\E/option selected>$form->{"AP_paid_$i"}/;
+
+ # format amounts
+ $form->{"paid_$i"} =
+ $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ $form->{"exchangerate_$i"} =
+ $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+
+ $exchangerate = qq| |;
+ if ($form->{currency} ne $form->{defaultcurrency}) {
+ if ($form->{"forex_$i"}) {
+ $exchangerate =
+ qq|{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
+ } else {
+ $exchangerate =
+ qq|{"exchangerate_$i"}>|;
}
- $exchangerate .= qq|
+ }
+ $exchangerate .= qq|
{"forex_$i"}>
|;
- $column_data{"paid_$i"} = qq|{"paid_$i"}> | |;
- $column_data{"exchangerate_$i"} = qq|$exchangerate | |;
- $column_data{"AP_paid_$i"} = qq| | |;
- $column_data{"datepaid_$i"} = qq|{"datepaid_$i"}> | |;
- $column_data{"source_$i"} = qq|{"source_$i"}> | |;
- $column_data{"memo_$i"} = qq|{"memo_$i"}> | |;
+ $column_data{"paid_$i"} =
+ qq|{"paid_$i"}> | |;
+ $column_data{"exchangerate_$i"} = qq|$exchangerate | |;
+ $column_data{"AP_paid_$i"} =
+ qq| | |;
+ $column_data{"datepaid_$i"} =
+ qq|{"datepaid_$i"}> | |;
+ $column_data{"source_$i"} =
+ qq|{"source_$i"}> | |;
+ $column_data{"memo_$i"} =
+ qq|{"memo_$i"}> | |;
- map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
+ map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
- print qq|
+ print qq|
|;
- }
-
- print qq|
+ }
+
+ print qq|
{oldinvtotal}>
{paidaccounts}>
@@ -618,33 +670,40 @@ print qq|
|;
- $invdate = $form->datetonum($form->{invdate}, \%myconfig);
+ $invdate = $form->datetonum($form->{invdate}, \%myconfig);
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
-
+
if ($form->{id}) {
- print qq|
+ print qq|
|;
if (!$form->{revtrans}) {
if (!$form->{locked}) {
- print qq|
-
-
+ print qq|
+
+
|;
}
}
if ($invdate > $closedto) {
print qq|
-
-
+
+
|;
}
} else {
if ($invdate > $closedto) {
- print qq|
- |;
+ print qq|
+ |;
}
}
@@ -652,8 +711,8 @@ print qq|
require "$form->{path}/menu.pl";
&menubar;
}
-
-print qq|
+
+ print qq|
{rowcount}>
@@ -672,92 +731,119 @@ print qq|
$lxdebug->leave_sub();
}
-
-
sub update {
$lxdebug->enter_sub();
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining);
-
+ map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+ qw(exchangerate creditlimit creditremaining);
+
&check_name(vendor);
&check_project;
- $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell')));
-
-
+ $form->{exchangerate} = $exchangerate
+ if (
+ $form->{forex} = (
+ $exchangerate =
+ $form->check_exchangerate(
+ \%myconfig, $form->{currency}, $form->{invdate}, 'sell'
+ )));
+
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
- map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
-
- $form->{"exchangerate_$i"} = $exchangerate if ($form->{"forex_$i"} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell')));
+ map {
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ } qw(paid exchangerate);
+
+ $form->{"exchangerate_$i"} = $exchangerate
+ if (
+ $form->{"forex_$i"} = (
+ $exchangerate =
+ $form->check_exchangerate(
+ \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell'
+ )));
}
}
-
- $i = $form->{rowcount};
+
+ $i = $form->{rowcount};
$exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
- if (($form->{"partnumber_$i"} eq "") && ($form->{"description_$i"} eq "") && ($form->{"partsgroup_$i"} eq "")) {
+ if ( ($form->{"partnumber_$i"} eq "")
+ && ($form->{"description_$i"} eq "")
+ && ($form->{"partsgroup_$i"} eq "")) {
$form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
&check_form;
-
- } else {
-
+
+ } else {
+
IR->retrieve_item(\%myconfig, \%$form);
my $rows = scalar @{ $form->{item_list} };
if ($rows) {
- $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
-
+ $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+
if ($rows > 1) {
-
- &select_item;
- exit;
-
+
+ &select_item;
+ exit;
+
} else {
+
# override sellprice if there is one entered
- $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
-
- map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
-
- map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
-
- $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
-
- ($dec) = ($s =~ /\.(\d+)/);
- $dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
-
+ $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
+
+ map { $form->{item_list}[$i]{$_} =~ s/\"/"/g }
+ qw(partnumber description unit);
+
+ map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} }
+ keys %{ $form->{item_list}[0] };
+
+ $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
+
+ ($dec) = ($s =~ /\.(\d+)/);
+ $dec = length $dec;
+ $decimalplaces = ($dec > 2) ? $dec : 2;
+
if ($sellprice) {
- $form->{"sellprice_$i"} = $sellprice;
- } else {
- # if there is an exchange rate adjust sellprice
- $form->{"sellprice_$i"} /= $exchangerate;
- }
-
- $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100);
- $form->{creditremaining} -= $amount;
- $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+ $form->{"sellprice_$i"} = $sellprice;
+ } else {
+
+ # if there is an exchange rate adjust sellprice
+ $form->{"sellprice_$i"} /= $exchangerate;
+ }
+
+ $amount =
+ $form->{"sellprice_$i"} * $form->{"qty_$i"} *
+ (1 - $form->{"discount_$i"} / 100);
+ $form->{creditremaining} -= $amount;
+ $form->{"sellprice_$i"} =
+ $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
+ $decimalplaces);
+ $form->{"qty_$i"} =
+ $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
}
&display_form;
} else {
+
# ok, so this is a new part
# ask if it is a part or service item
- if ($form->{"partsgroup_$i"} && ($form->{"partsnumber_$i"} eq "") && ($form->{"description_$i"} eq "")) {
- $form->{rowcount}--;
- $form->{"discount_$i"} = "";
- &display_form;
- } else {
-
- $form->{"id_$i"} = 0;
- $form->{"unit_$i"} = $locale->text('ea');
+ if ( $form->{"partsgroup_$i"}
+ && ($form->{"partsnumber_$i"} eq "")
+ && ($form->{"description_$i"} eq "")) {
+ $form->{rowcount}--;
+ $form->{"discount_$i"} = "";
+ &display_form;
+ } else {
- &new_item;
+ $form->{"id_$i"} = 0;
+ $form->{"unit_$i"} = $locale->text('ea');
+
+ &new_item;
}
}
@@ -765,14 +851,12 @@ sub update {
$lxdebug->leave_sub();
}
-
-
sub post {
$lxdebug->enter_sub();
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
- $form->isblank("vendor", $locale->text('Vendor missing!'));
-
+ $form->isblank("vendor", $locale->text('Vendor missing!'));
+
# if the vendor changed get new values
if (&check_name(vendor)) {
&update;
@@ -782,41 +866,46 @@ sub post {
&validate_items;
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
- $invdate = $form->datetonum($form->{invdate}, \%myconfig);
+ $invdate = $form->datetonum($form->{invdate}, \%myconfig);
- $form->error($locale->text('Cannot post invoice for a closed period!')) if ($invdate <= $closedto);
+ $form->error($locale->text('Cannot post invoice for a closed period!'))
+ if ($invdate <= $closedto);
+
+ $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
+ if ($form->{currency} ne $form->{defaultcurrency});
- $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) if ($form->{currency} ne $form->{defaultcurrency});
-
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
-
- $form->error($locale->text('Cannot post payment for a closed period!')) if ($datepaid <= $closedto);
-
+
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($datepaid <= $closedto);
+
if ($form->{currency} ne $form->{defaultcurrency}) {
- $form->{"exchangerate_$i"} = $form->{exchangerate} if ($invdate == $datepaid);
- $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
}
}
}
-
-
- ($form->{AP}) = split /--/, $form->{AP};
+
+ ($form->{AP}) = split /--/, $form->{AP};
($form->{AP_paid}) = split /--/, $form->{AP_paid};
-
+
$form->{id} = 0 if $form->{postasnew};
- $form->redirect($locale->text('Invoice')." $form->{invnumber} ".$locale->text('posted!')) if (IR->post_invoice(\%myconfig, \%$form));
+ $form->redirect( $locale->text('Invoice')
+ . " $form->{invnumber} "
+ . $locale->text('posted!'))
+ if (IR->post_invoice(\%myconfig, \%$form));
$form->error($locale->text('Cannot post invoice!'));
-
+
$lxdebug->leave_sub();
}
-
-
sub delete {
$lxdebug->enter_sub();
@@ -837,27 +926,26 @@ sub delete {
}
print qq|
-|.$locale->text('Confirm!').qq|
+| . $locale->text('Confirm!') . qq|
-|.$locale->text('Are you sure you want to delete Invoice Number').qq| $form->{invnumber}
+|
+ . $locale->text('Are you sure you want to delete Invoice Number')
+ . qq| $form->{invnumber}
-
+
|;
-
$lxdebug->leave_sub();
}
-
-
sub yes {
$lxdebug->enter_sub();
- $form->redirect($locale->text('Invoice deleted!')) if (IR->delete_invoice(\%myconfig, \%$form));
+ $form->redirect($locale->text('Invoice deleted!'))
+ if (IR->delete_invoice(\%myconfig, \%$form));
$form->error($locale->text('Cannot delete invoice!'));
$lxdebug->leave_sub();
}
-
-
| | |