use SL::FU;
use SL::IS;
use SL::PE;
+use SL::OE;
use Data::Dumper;
use List::Util qw(max sum);
use strict;
-my $edit;
-my $payment;
-my $print_post;
-
1;
# end of main
}
}
- my $payment_id;
- if ($form->{payment_id}) {
- $payment_id = $form->{payment_id};
- }
- my $language_id;
- if ($form->{language_id}) {
- $language_id = $form->{language_id};
- }
- my $taxzone_id;
- if ($form->{taxzone_id}) {
- $taxzone_id = $form->{taxzone_id};
- }
- my $id;
- if ($form->{id}) {
- $id = $form->{id};
- }
- my $shipto_id;
- if ($form->{shipto_id}) {
- $shipto_id = $form->{shipto_id};
- }
+ my $editing = $form->{id};
+
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id));
- my $cp_id = $form->{cp_id};
IS->get_customer(\%myconfig, \%$form);
#quote all_customer Bug 133
foreach my $ref (@{ $form->{all_customer} }) {
$ref->{name} = $form->quote($ref->{name});
}
- if ($id) {
- $form->{id} = $id;
- }
+
+ $form->restore_vars(qw(id));
+
IS->retrieve_invoice(\%myconfig, \%$form);
- $form->{cp_id} = $cp_id;
+ $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id));
+ $form->restore_vars(qw(taxincluded)) if $form->{id};
+ $form->restore_vars(qw(salesman_id)) if $editing;
- if ($payment_id) {
- $form->{payment_id} = $payment_id;
- }
- if ($language_id) {
- $form->{language_id} = $language_id;
- }
- if ($taxzone_id) {
- $form->{taxzone_id} = $taxzone_id;
- }
- if ($shipto_id) {
- $form->{shipto_id} = $shipto_id;
- }
- $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
- $form->{selectcustomer} = 1;
+ # build vendor/customer drop down comatibility... don't ask
+ if (@{ $form->{"all_customer"} }) {
+ $form->{"selectcustomer"} = 1;
+ $form->{customer} = qq|$form->{customer}--$form->{"customer_id"}|;
+ }
- # departments
- if ($form->{all_departments}) {
- $form->{selectdepartment} = "<option>\n";
- $form->{department} = "$form->{department}--$form->{department_id}";
+ $form->{"oldcustomer"} = $form->{customer};
- map {
- $form->{selectdepartment} .=
- "<option>$_->{description}--$_->{id}</option>\n"
- } (@{ $form->{all_departments} });
+ if ($form->{"oldcustomer"} !~ m/--\d+$/ && $form->{"customer_id"}) {
+ $form->{"oldcustomer"} .= qq|--$form->{"customer_id"}|
}
+
+# $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
+# $form->{selectcustomer} = 1;
+
$form->{employee} = "$form->{employee}--$form->{employee_id}";
# forex
foreach my $key (keys %{ $form->{AR_links} }) {
foreach my $ref (@{ $form->{AR_links}{$key} }) {
- $form->{"select$key"} .=
-"<option>$ref->{accno}--$ref->{description}</option>\n";
+ $form->{"select$key"} .= "<option>$ref->{accno}--$ref->{description}</option>\n";
}
if ($key eq "AR_paid") {
next unless $form->{acc_trans}{$key};
for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
- $form->{"AR_paid_$i"} =
- "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+ $form->{"AR_paid_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
# reverse paid
- $form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
- $form->{"datepaid_$i"} =
- $form->{acc_trans}{$key}->[$i - 1]->{transdate};
- $form->{"forex_$i"} = $form->{"exchangerate_$i"} =
- $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
- $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
- $form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+ $form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
+ $form->{"datepaid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+ $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
+ $form->{"forex_$i"} = $form->{"exchangerate_$i"};
+ $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
+ $form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{memo};
$form->{paidaccounts} = $i;
}
} else {
- $form->{$key} =
- "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
+ $form->{$key} = "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
}
-
}
$form->{paidaccounts} = 1 unless (exists $form->{paidaccounts});
$form->{AR} = $form->{AR_1} unless $form->{id};
- $form->{locked} =
- ($form->datetonum($form->{invdate}, \%myconfig) <=
- $form->datetonum($form->{closedto}, \%myconfig));
+ $form->{locked} = ($form->datetonum($form->{invdate}, \%myconfig)
+ <= $form->datetonum($form->{closedto}, \%myconfig));
$main::lxdebug->leave_sub();
}
(my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
$dec_qty = length $dec_qty;
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces);
+
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
+ $form->{"sellprice_pg_$i"} = join ('--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"});
+
$form->{rowcount} = $i;
}
$main::auth->assert('invoice_edit');
- our %TMPL_VAR = ();
+ my %TMPL_VAR = ();
my @custom_hiddens;
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
-
- $payment = qq|<option value=""></option>|;
- foreach my $item (@{ $form->{payment_terms} }) {
- if ($form->{payment_id} eq $item->{id}) {
- $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
- } else {
- $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
- }
- }
my $set_duedate_url = "$form->{script}?action=set_duedate";
"taxzones" => "ALL_TAXZONES",
"currencies" => "ALL_CURRENCIES",
"customers" => "ALL_CUSTOMERS",
+ "departments" => "all_departments",
"price_factors" => "ALL_PRICE_FACTORS");
$TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} };
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
$TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
- $TMPL_VAR{currencies} = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
+ $TMPL_VAR{currencies} = NTI($::cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
'-values' => \@values, '-labels' => \%labels)) if scalar @values;
push @custom_hiddens, "forex";
push @custom_hiddens, "exchangerate" if $form->{forex};
$TMPL_VAR{numberformat} = $myconfig{numberformat};
# hiddens
- $TMPL_VAR{HIDDEN} = [qw(
+ $TMPL_VAR{HIDDENS} = [qw(
id action type media format queued printed emailed title vc discount
- creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
+ title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
max_dunning_level dunning_amount
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax
shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
$main::auth->assert('invoice_edit');
- $form->{invtotal} = $form->{invsubtotal};
-
- my ($rows, $introws);
- if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
- $rows = 2;
- }
- if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) {
- $introws = 2;
- }
- $rows = ($rows > $introws) ? $rows : $introws;
- my $notes = qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
- my $intnotes = qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
+ $form->{invtotal} = $form->{invsubtotal};
+ $form->{oldinvtotal} = $form->{invtotal};
- $form->{taxincluded} = ($form->{taxincluded} ? "checked" : "");
+ # note rows
+ $form->{rows} = max 2,
+ $form->numtextrows($form->{notes}, 26, 8),
+ $form->numtextrows($form->{intnotes}, 35, 8);
- my $taxincluded = "";
- if ($form->{taxaccounts}) {
- $taxincluded = qq| <input name="taxincluded" class="checkbox" type="checkbox" $form->{taxincluded}> <b>| . $locale->text('Tax Included') . qq|</b><br><br>|;
- }
+ # tax, total and subtotal calculations
my ($tax, $subtotal);
- if (!$form->{taxincluded}) {
+ $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
- foreach my $item (split / /, $form->{taxaccounts}) {
- if ($form->{"${item}_base"}) {
+ foreach my $item (@{ $form->{taxaccounts_array} }) {
+ if ($form->{"${item}_base"}) {
+ if ($form->{taxincluded}) {
+ $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"}
+ / (1 + $form->{"${item}_rate"})), 2);
+ $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
+ } else {
$form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
$form->{invtotal} += $form->{"${item}_total"};
- $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-
- $tax .= qq|
- <tr>
- <th align="right">$form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|%</th>
- <td align="right">$form->{"${item}_total"}</td>
- </tr>
-|;
}
}
-
- $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
-
- $subtotal = qq|
- <tr>
- <th align="right">| . $locale->text('Subtotal') . qq|</th>
- <td align="right">$form->{invsubtotal}</td>
- </tr>
-|;
-
}
- if ($form->{taxincluded}) {
- foreach my $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}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
- $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
- $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
-
- $tax .= qq|
- <tr>
- <th align="right">Enthaltene $form->{"${item}_description"} |
- . $form->{"${item}_rate"} * 100 .qq|%</th>
- <td align="right">$form->{"${item}_total"}</td>
- </tr>
- <tr>
- <th align="right">Nettobetrag</th>
- <td align="right">$form->{"${item}_netto"}</td>
- </tr>
-|;
- }
- }
-
- }
-
- $form->{oldinvtotal} = $form->{invtotal};
- $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
-
- my $follow_ups_block;
+ # follow ups
if ($form->{id}) {
- my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
-
- if (@{ $follow_ups} ) {
- my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups };
- $follow_ups_block = qq|
- <tr>
- <td colspan="2">| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</td>
- </tr>
-|;
- }
- }
-
- print qq|
- <tr>
- <td>
- <table width="100%">
- <tr valign="bottom">
- <td>
- <table>
- <tr>
- <th align="left">| . $locale->text('Notes') . qq|</th>
- <th align="left">| . $locale->text('Internal Notes') . qq|</th>
- <th align="right">| . $locale->text('Payment Terms') . qq|</th>
- </tr>
- <tr valign="top">
- <td>$notes</td>
- <td>$intnotes</td>
- <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
- </select></td>
- </tr>
- $follow_ups_block
- </table>
- </td>
- <td>
- <table>
- <tr>
- <th align=left>| . $locale->text('Ertrag') . qq|</th>
- <td>| . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
- </tr>
- <tr>
- <th align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
- <td>| . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
- </tr>
- <input type=hidden name="marge_total" value="$form->{"marge_total"}">
- <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
- </table>
- </td>
- <td align="right">
- $taxincluded
- <table>
- $subtotal
- $tax
- <tr>
- <th align="right">| . $locale->text('Total') . qq|</th>
- <td align="right">$form->{invtotal}</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-|;
- my $webdav_list;
- if ($main::webdav) {
- $webdav_list = qq|
- <tr>
- <td><hr size="3" noshade></td>
- </tr>
- <tr>
- <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
- </tr>
- <table width="100%">
- <td align="left" width="30%"><b>Dateiname</b></td>
- <td align="left" width="70%"><b>Webdavlink</b></td>
-|;
- foreach my $file (@{ $form->{WEBDAV} }) {
- $webdav_list .= qq|
- <tr>
- <td align="left">$file->{name}</td>
- <td align="left"><a href="$file->{link}">$file->{type}</a></td>
- </tr>
-|;
- }
- $webdav_list .= qq|
- </table>
- </tr>
-|;
-
- print $webdav_list;
- }
-if ($form->{type} eq "credit_note") {
- print qq|
- <tr>
- <td>
- <table width="100%">
- <tr class="listheading">
- <th colspan="6" class="listheading">|
- . $locale->text('Payments') . qq|</th>
- </tr>
-|;
-} else {
- print qq|
- <tr>
- <td>
- <table width="100%">
- <tr class="listheading">
- <th colspan="6" class="listheading">|
- . $locale->text('Incoming Payments') . qq|</th>
- </tr>
-|;
-}
-
- my @column_index;
- if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AR_paid);
- } else {
- @column_index = qw(datepaid source memo paid exchangerate AR_paid);
+ $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}) || [];
+ $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
}
- my %column_data;
- $column_data{datepaid} = "<th>" . $locale->text('Date') . "</th>";
- $column_data{paid} = "<th>" . $locale->text('Amount') . "</th>";
- $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
- $column_data{AR_paid} = "<th>" . $locale->text('Account') . "</th>";
- $column_data{source} = "<th>" . $locale->text('Source') . "</th>";
- $column_data{memo} = "<th>" . $locale->text('Memo') . "</th>";
-
- print "
- <tr>
-";
- map { print "$column_data{$_}\n" } @column_index;
- print "
- </tr>
-";
-
- my @triggers = ();
+ # payments
my $totalpaid = 0;
-
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
- for my $i (1 .. $form->{paidaccounts}) {
+ $form->{paid_indices} = [ 1 .. $form->{paidaccounts} ];
- print "
- <tr>\n";
+ # Standard Konto für Umlaufvermögen
+ my $accno_arap = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+ for my $i (1 .. $form->{paidaccounts}) {
$form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
- $form->{"selectAR_paid_$i"} =~
- s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
-
- # format amounts
- $totalpaid += $form->{"paid_$i"};
- if ($form->{"paid_$i"}) {
- $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
- }
- $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-
- if ($form->{"exchangerate_$i"} == 0) {
- $form->{"exchangerate_$i"} = "";
- }
- my $exchangerate = qq| |;
- if ($form->{currency} ne $form->{defaultcurrency}) {
- if ($form->{"forex_$i"}) {
- $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
- } else {
- $exchangerate = qq|<input name="exchangerate_$i" size="10" value="$form->{"exchangerate_$i"}">|;
- }
- }
-
- $exchangerate .= qq|<input type="hidden" name="forex_$i" value="$form->{"forex_$i"}">|;
-
- $column_data{"paid_$i"} =
- qq|<td align="center"><input name="paid_$i" size="11" value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
- $column_data{"exchangerate_$i"} = qq|<td align="center">$exchangerate</td>|;
- $column_data{"AR_paid_$i"} =
- qq|<td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
- $column_data{"datepaid_$i"} =
- qq|<td align="center"><input id="datepaid_$i" name="datepaid_$i" size="11" title="$myconfig{dateformat}" value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
- <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
- $column_data{"source_$i"} =
- qq|<td align=center><input name="source_$i" size="11" value="$form->{"source_$i"}"></td>|;
- $column_data{"memo_$i"} =
- qq|<td align="center"><input name="memo_$i" size="11" value="$form->{"memo_$i"}"></td>|;
-
- map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
- print "
- </tr>\n";
- push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
- }
-
- my $paid_missing = $form->{oldinvtotal} - $totalpaid;
-
- print qq|
- <tr>
- <td></td>
- <td></td>
- <td align="center">| . $locale->text('Total') . qq|</td>
- <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td align="center">| . $locale->text('Missing amount') . qq|</td>
- <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
- </tr>
-|;
-
- map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
- print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size="3" noshade></td>
- </tr>
- <tr>
- <td>
-|;
-
- print_options();
-
- print qq|
- </td>
- </tr>
-</table>
-|;
-
- my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
- my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-
- if ($form->{id}) {
- my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
-
- print qq|
- <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="| . $locale->text('Update') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('Ship to') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('Print') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('E-mail') . qq|"> |;
- print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Storno') . qq|"> | if ($show_storno);
- print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Post Payment') . qq|"> |;
- print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Use As Template') . qq|"> |;
- if ($form->{id} && !($form->{type} eq "credit_note")) {
- print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Credit Note') . qq|"> |;
- }
- if ($form->{radier}) {
- print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Delete') . qq|"> |;
- }
-
-
- if ($invdate > $closedto) {
- print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Order') . qq|"> |;
- }
-
- print qq| <input type="button" class="submit" onclick="follow_up_window()" value="| . $locale->text('Follow-Up') . qq|">|;
-
- } else {
- if ($invdate > $closedto) {
- print qq|
- <input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('Ship to') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('Preview') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('E-mail') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('Print and Post') . qq|">
- <input class="submit" type="submit" name="action" value="| . $locale->text('Post') . qq|"> | .
- NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
+ if (!$form->{"AR_paid_$i"}) {
+ $form->{"selectAR_paid_$i"} =~ s/option>$accno_arap--(.*?)</option selected>$accno_arap--$1</;
+ } else {
+ $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
}
- }
- # button for saving history
- if($form->{id} ne "") {
- print qq|
- <input type="button" class="submit" onclick="set_history_window(|
- . Q($form->{id})
- . qq|);" name="history" id="history" value="|
- . $locale->text('history')
- . qq|"> |;
- }
- # /button for saving history
-
- # mark_as_paid button
- if($form->{id} ne "") {
- print qq|<input type="submit" class="submit" name="action" value="| . $locale->text('mark as paid') . qq|">|;
+ $totalpaid += $form->{"paid_$i"};
}
- # /mark_as_paid button
- print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
- qq|
-
-<input type="hidden" name="rowcount" value="$form->{rowcount}">
-| .
-$cgi->hidden("-name" => "callback", "-value" => $form->{callback})
-. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
-. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
-. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
-. qq|
-</form>
-
-</body>
- </html>
-|;
+ print $form->parse_html_template('is/form_footer', {
+ is_type_credit_note => ($form->{type} eq "credit_note"),
+ totalpaid => $totalpaid,
+ paid_missing => $form->{invtotal} - $totalpaid,
+ print_options => print_options(inline => 1),
+ show_storno => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && !$totalpaid,
+ show_delete => ($form->current_date(\%myconfig) eq $form->{gldate}),
+ });
+##print $form->parse_html_template('is/_payments'); # parser
+##print $form->parse_html_template('webdav/_list'); # parser
$main::lxdebug->leave_sub();
}
my ($recursive_call) = shift;
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
+# map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
$form->{print_and_post} = 0 if $form->{second_run};
my $taxincluded = "checked" if $form->{taxincluded};
my $rows = scalar @{ $form->{item_list} };
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
+ # Falls kein Kundenrabatt vorhanden ist, den aktuellen Rabatt nicht mit 0% überschreiben,
+ # da hier der Anwender schon manual einen Wert eingetragen haben könnte (analog zu qty) Bugfix: 1412
+ if ($form->{customer_discount}){
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
+ }
if ($rows) {
$form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
if ($rows > 1) {
&select_item;
- exit;
+ ::end_of_request();
} else {
$form->{creditremaining} -= $amount;
- map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice);
+ map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice lastcost);
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
$main::auth->assert('invoice_edit');
- our $invdate;
+ my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
for my $i (1 .. $form->{paidaccounts}) {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
- $form->error($locale->text('Cannot post payment for a closed period!'))
- if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
}
}
}
+ # Abgeschlossene Zeiträume nur für den letzten (aktuellen) Zahlungseingang prüfen
+ # Details s.a. Bug 1502
+ # Das Problem ist jetzt, dass man Zahlungseingänge nachträglich ändern kann
+ # Wobei dies für Installationen die sowieso nicht mit Bücherkontrolle arbeiten keinen
+ # keinen Unterschied macht.
+ # Optimal wäre, wenn gegen einen Zeitstempel des Zahlungsfelds geprüft würde ...
+ # Das Problem hierbei ist, dass in IS.pm post_invoice IMMER alle Zahlungseingänge aus $form
+ # erneut gespeichert werden. Prinzipiell wäre es besser NUR die Änderungen des Rechnungs-
+ # belegs (neue Zahlung aber nichts anderes) zu speichern ...
+ # Vielleicht könnte man ähnlich wie bei Rechnung löschen verfahren
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($form->date_closed($form->{"datepaid_$form->{paidaccounts}"}, \%myconfig));
($form->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
# if oldcustomer ne customer redo form
if (&check_name('customer')) {
&update;
+ ::end_of_request();
+ }
+
+ if ($myconfig{mandatory_departments} && !$form->{department_id}) {
+ $form->{saved_message} = $::locale->text('You have to specify a department.');
+ update();
exit;
}
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
+ remove_emptied_rows();
&validate_items;
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
if(!exists $form->{addition}) {
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = $print_post ? "PRINTED AND POSTED" :
- $form->{storno} ? "STORNO" :
- "POSTED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = $form->{print_and_post} ? "PRINTED AND POSTED" :
+ $form->{storno} ? "STORNO" :
+ "POSTED";
+ $form->save_history;
}
- $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
- unless $print_post;
+ if (!$form->{no_redirect_after_post}) {
+ $form->{action} = 'edit';
+ $form->{script} = 'is.pl';
+ $form->{saved_message} = $form->{label} . " $form->{invnumber} " . $locale->text('posted!');
+ $form->{callback} = build_std_url(qw(action edit id saved_message));
+ $form->redirect;
+ }
$main::lxdebug->leave_sub();
}
$main::auth->assert('invoice_edit');
- my $old_form = new Form;
- $print_post = 1;
- $form->{print_and_post} = 1;
+ my $old_form = new Form;
+ $form->{no_redirect_after_post} = 1;
+ $form->{print_and_post} = 1;
&post();
&edit();
$form->{title} = $locale->text('Add Credit Note');
$form->{script} = 'is.pl';
- our $script = "is";
- our $buysell = 'buy';
# bo creates the id, reset it
map { $form->{"select$_"} = "" } ($form->{vc}, 'currency');
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
- qw(creditlimit creditremaining);
+# map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+# qw(creditlimit creditremaining);
my $currency = $form->{currency};
&invoice_links;
$form->{currency} = $currency;
- $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, $buysell);
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, 'buy');
$form->{exchangerate} = $form->{forex} || '';
$form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
+ # bei Gutschriften werden Zahlungseingänge aus Rechnung nicht übernommen
+ for my $i (1 .. $form->{paidaccounts}) {
+ delete $form->{"paid_$i"};
+ delete $form->{"source_$i"};
+ delete $form->{"memo_$i"};
+ delete $form->{"datepaid_$i"};
+ delete $form->{"AR_paid_$i"};
+ };
+ $form->{paidaccounts} = 1;
+
&prepare_invoice;
if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) {
# saving the history
- if(!exists $form->{addition}) {
+ if(!exists $form->{addition}) {
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "DELETED";
+ $form->save_history;
}
# /saving the history
$form->redirect($locale->text('Invoice deleted!'));
$main::auth->assert('invoice_edit');
if (!$form->{id}) {
- $print_post = 1;
+ $form->{no_redirect_after_post} = 1;
my $saved_form = save_form();
projects / kivitendo-erp.git / blobdiff