package IS;
+#use strict;
+
+use List::Util qw(max);
+
use SL::AM;
+use SL::ARAP;
+use SL::CVar;
use SL::Common;
use SL::DBUtils;
+use SL::DO;
use SL::MoreCommon;
+use SL::IC;
+use Data::Dumper;
sub invoice_details {
$main::lxdebug->enter_sub();
push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});
+ $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+ my %price_factors;
+
+ foreach my $pfac (@{ $form->{ALL_PRICE_FACTORS} }) {
+ $price_factors{$pfac->{id}} = $pfac;
+ $pfac->{factor} *= 1;
+ $pfac->{formatted_factor} = $form->format_amount($myconfig, $pfac->{factor});
+ }
+
# sort items by partsgroup
- for $i (1 .. $form->{rowcount}) {
- $partsgroup = "";
- if ($form->{"partsgroup_$i"} && $form->{groupitems}) {
- $partsgroup = $form->{"partsgroup_$i"};
- }
- push @partsgroup, [$i, $partsgroup];
+ for my $i (1 .. $form->{rowcount}) {
+# $partsgroup = "";
+# if ($form->{"partsgroup_$i"} && $form->{groupitems}) {
+# $partsgroup = $form->{"partsgroup_$i"};
+# }
+# push @partsgroup, [$i, $partsgroup];
push(@project_ids, $form->{"project_id_$i"}) if ($form->{"project_id_$i"});
}
my $subtotal_header = 0;
my $subposition = 0;
+ $form->{discount} = [];
+
+ IC->prepare_parts_for_printing();
+
my @arrays =
qw(runningnumber number description longdescription qty ship unit bin
deliverydate_oe ordnumber_oe transdate_oe licensenumber validuntil
partnotes serialnumber reqdate sellprice listprice netprice
discount p_discount discount_sub nodiscount_sub
- linetotal nodiscount_linetotal tax_rate projectnumber);
+ linetotal nodiscount_linetotal tax_rate projectnumber
+ price_factor price_factor_name partsgroup);
- my @tax_arrays =
- qw(taxbase tax taxdescription taxrate taxnumber);
+ my @tax_arrays = qw(taxbase tax taxdescription taxrate taxnumber);
+
+ my @payment_arrays = qw(payment paymentaccount paymentdate paymentsource paymentmemo);
+
+ $form->{TEMPLATE_ARRAYS} = { map { $_ => [] } (@arrays, @tax_arrays, @payment_arrays) };
foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
$i = $item->[0];
if ($item->[1] ne $sameitem) {
- push(@{ $form->{description} }, qq|$item->[1]|);
+ push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, qq|$item->[1]|);
$sameitem = $item->[1];
- map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } @arrays));
}
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
$position = int($position);
$position++;
}
- push(@{ $form->{runningnumber} }, $position);
- push(@{ $form->{number} }, qq|$form->{"partnumber_$i"}|);
- push(@{ $form->{serialnumber} }, qq|$form->{"serialnumber_$i"}|);
- push(@{ $form->{bin} }, qq|$form->{"bin_$i"}|);
- push(@{ $form->{"partnotes"} }, qq|$form->{"partnotes_$i"}|);
- push(@{ $form->{description} }, qq|$form->{"description_$i"}|);
- push(@{ $form->{longdescription} }, qq|$form->{"longdescription_$i"}|);
- push(@{ $form->{qty} },
- $form->format_amount($myconfig, $form->{"qty_$i"}));
- push(@{ $form->{unit} }, qq|$form->{"unit_$i"}|);
- push(@{ $form->{deliverydate_oe} }, qq|$form->{"deliverydate_$i"}|);
-
- push(@{ $form->{sellprice} }, $form->{"sellprice_$i"});
- push(@{ $form->{ordnumber_oe} }, qq|$form->{"ordnumber_$i"}|);
- push(@{ $form->{transdate_oe} }, qq|$form->{"transdate_$i"}|);
- push(@{ $form->{invnumber} }, qq|$form->{"invnumber"}|);
- push(@{ $form->{invdate} }, qq|$form->{"invdate"}|);
+
+ my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 };
+
+ push @{ $form->{TEMPLATE_ARRAYS}->{runningnumber} }, $position;
+ push @{ $form->{TEMPLATE_ARRAYS}->{number} }, $form->{"partnumber_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{serialnumber} }, $form->{"serialnumber_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{bin} }, $form->{"bin_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{partnotes} }, $form->{"partnotes_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{description} }, $form->{"description_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{longdescription} }, $form->{"longdescription_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{qty} }, $form->format_amount($myconfig, $form->{"qty_$i"});
+ push @{ $form->{TEMPLATE_ARRAYS}->{unit} }, $form->{"unit_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{deliverydate_oe} }, $form->{"deliverydate_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{sellprice} }, $form->{"sellprice_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{ordnumber_oe} }, $form->{"ordnumber_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{transdate_oe} }, $form->{"transdate_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{invnumber} }, $form->{"invnumber"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{invdate} }, $form->{"invdate"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{price_factor} }, $price_factor->{formatted_factor};
+ push @{ $form->{TEMPLATE_ARRAYS}->{price_factor_name} }, $price_factor->{description};
+ push @{ $form->{TEMPLATE_ARRAYS}->{partsgroup} }, $form->{"partsgroup_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{reqdate} }, $form->{"reqdate_$i"};
if ($form->{lizenzen}) {
if ($form->{"licensenumber_$i"}) {
$query = qq|SELECT licensenumber, validuntil FROM license WHERE id = ?|;
- ($licensenumber, $validuntil) = selectrow_query($form, $dbh, $query, conv_i($form->{"licensenumber_$i"}));
- push(@{ $form->{licensenumber} }, $licensenumber);
- push(@{ $form->{validuntil} }, $locale->date($myconfig, $validuntil, 0));
+ my ($licensenumber, $validuntil) = selectrow_query($form, $dbh, $query, conv_i($form->{"licensenumber_$i"}));
+ push(@{ $form->{TEMPLATE_ARRAYS}->{licensenumber} }, $licensenumber);
+ push(@{ $form->{TEMPLATE_ARRAYS}->{validuntil} }, $locale->date($myconfig, $validuntil, 0));
} else {
- push(@{ $form->{licensenumber} }, "");
- push(@{ $form->{validuntil} }, "");
+ push(@{ $form->{TEMPLATE_ARRAYS}->{licensenumber} }, "");
+ push(@{ $form->{TEMPLATE_ARRAYS}->{validuntil} }, "");
}
}
# listprice
- push(@{ $form->{listprice} }, $form->{"listprice_$i"});
-
- my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
- my ($dec) = ($sellprice =~ /\.(\d+)/);
- $dec = length $dec;
- my $decimalplaces = ($dec > 2) ? $dec : 2;
-
- my $i_discount =
- $form->round_amount(
- $sellprice * $form->parse_amount($myconfig,
- $form->{"discount_$i"}) / 100,
- $decimalplaces);
+ push(@{ $form->{TEMPLATE_ARRAYS}->{listprice} }, $form->{"listprice_$i"});
- my $discount =
- $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
+ my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+ my ($dec) = ($sellprice =~ /\.(\d+)/);
+ my $decimalplaces = max 2, length($dec);
- # keep a netprice as well, (sellprice - discount)
- $form->{"netprice_$i"} = $sellprice - $i_discount;
+ my $parsed_discount = $form->parse_amount($myconfig, $form->{"discount_$i"});
+ my $linetotal_exact = $form->{"qty_$i"} * $sellprice * (100 - $parsed_discount) / 100 / $price_factor->{factor};
+ my $linetotal = $form->round_amount($linetotal_exact, 2);
+ my $discount = $form->round_amount($form->{"qty_$i"} * $sellprice * $parsed_discount / 100 / $price_factor->{factor} - ($linetotal - $linetotal_exact),
+ $decimalplaces);
+ my $nodiscount_linetotal = $form->round_amount($form->{"qty_$i"} * $sellprice / $price_factor->{factor}, 2);
+ $form->{"netprice_$i"} = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, 2);
- push(@{ $form->{netprice} },
- ($form->{"netprice_$i"} != 0)
- ? $form->format_amount(
- $myconfig, $form->{"netprice_$i"},
- $decimalplaces
- )
- : " ");
+ push @{ $form->{TEMPLATE_ARRAYS}->{netprice} }, ($form->{"netprice_$i"} != 0) ? $form->format_amount($myconfig, $form->{"netprice_$i"}, $decimalplaces) : '';
- my $linetotal =
- $form->round_amount($form->{"qty_$i"} * $form->{"netprice_$i"}, 2);
+ $linetotal = ($linetotal != 0) ? $linetotal : '';
- my $nodiscount_linetotal =
- $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
+ push @{ $form->{TEMPLATE_ARRAYS}->{discount} }, ($discount != 0) ? $form->format_amount($myconfig, $discount * -1, 2) : '';
+ push @{ $form->{TEMPLATE_ARRAYS}->{p_discount} }, $form->{"discount_$i"};
- $discount =
- ($discount != 0)
- ? $form->format_amount($myconfig, $discount * -1, $decimalplaces)
- : " ";
- $linetotal = ($linetotal != 0) ? $linetotal : " ";
+ $form->{total} += $linetotal;
+ $form->{nodiscount_total} += $nodiscount_linetotal;
+ $form->{discount_total} += $discount;
- push(@{ $form->{discount} }, $discount);
- push(@{ $form->{p_discount} }, $form->{"discount_$i"});
- if (($form->{"discount_$i"} ne "") && ($form->{"discount_$i"} != 0)) {
- $form->{discount_p} = $form->{"discount_$i"};
+ if ($subtotal_header) {
+ $discount_subtotal += $linetotal;
+ $nodiscount_subtotal += $nodiscount_linetotal;
}
- $form->{total} += $linetotal;
- $discount_subtotal += $linetotal;
- $form->{nodiscount_total} += $nodiscount_linetotal;
- $nodiscount_subtotal += $nodiscount_linetotal;
- $form->{discount_total} += $form->parse_amount($myconfig, $discount);
if ($form->{"subtotal_$i"} && $subtotal_header && ($subtotal_header != $i)) {
- $discount_subtotal = $form->format_amount($myconfig, $discount_subtotal, 2);
- push(@{ $form->{discount_sub} }, $discount_subtotal);
- $nodiscount_subtotal = $form->format_amount($myconfig, $nodiscount_subtotal, 2);
- push(@{ $form->{nodiscount_sub} }, $nodiscount_subtotal);
- $discount_subtotal = 0;
+ push @{ $form->{TEMPLATE_ARRAYS}->{discount_sub} }, $form->format_amount($myconfig, $discount_subtotal, 2);
+ push @{ $form->{TEMPLATE_ARRAYS}->{nodiscount_sub} }, $form->format_amount($myconfig, $nodiscount_subtotal, 2);
+
+ $discount_subtotal = 0;
$nodiscount_subtotal = 0;
- $subtotal_header = 0;
+ $subtotal_header = 0;
+
} else {
- push(@{ $form->{discount_sub} }, "");
- push(@{ $form->{nodiscount_sub} }, "");
+ push @{ $form->{TEMPLATE_ARRAYS}->{discount_sub} }, "";
+ push @{ $form->{TEMPLATE_ARRAYS}->{nodiscount_sub} }, "";
}
- if ($linetotal == $netto_linetotal) {
+ if (!$form->{"discount_$i"}) {
$nodiscount += $linetotal;
}
- push(@{ $form->{linetotal} },
- $form->format_amount($myconfig, $linetotal, 2));
- push(@{ $form->{nodiscount_linetotal} },
- $form->format_amount($myconfig, $nodiscount_linetotal, 2));
+ push @{ $form->{TEMPLATE_ARRAYS}->{linetotal} }, $form->format_amount($myconfig, $linetotal, 2);
+ push @{ $form->{TEMPLATE_ARRAYS}->{nodiscount_linetotal} }, $form->format_amount($myconfig, $nodiscount_linetotal, 2);
- push(@{ $form->{projectnumber} }, $projectnumbers{$form->{"project_id_$i"}});
+ push(@{ $form->{TEMPLATE_ARRAYS}->{projectnumber} }, $projectnumbers{$form->{"project_id_$i"}});
@taxaccounts = split(/ /, $form->{"taxaccounts_$i"});
$taxrate = 0;
if ($form->round_amount($taxrate, 7) == 0) {
if ($form->{taxincluded}) {
- foreach $item (@taxaccounts) {
- $taxamount =
- $form->round_amount($linetotal * $form->{"${item}_rate"} /
- (1 + abs($form->{"${item}_rate"})),
- 2);
+ foreach my $accno (@taxaccounts) {
+ $taxamount = $form->round_amount($linetotal * $form->{"${accno}_rate"} / (1 + abs($form->{"${accno}_rate"})), 2);
- $taxaccounts{$item} += $taxamount;
- $taxdiff += $taxamount;
+ $taxaccounts{$accno} += $taxamount;
+ $taxdiff += $taxamount;
- $taxbase{$item} += $taxbase;
+ $taxbase{$accno} += $taxbase;
}
$taxaccounts{ $taxaccounts[0] } += $taxdiff;
} else {
- foreach $item (@taxaccounts) {
- $taxaccounts{$item} += $linetotal * $form->{"${item}_rate"};
- $taxbase{$item} += $taxbase;
+ foreach my $accno (@taxaccounts) {
+ $taxaccounts{$accno} += $linetotal * $form->{"${accno}_rate"};
+ $taxbase{$accno} += $taxbase;
}
}
} else {
- foreach $item (@taxaccounts) {
- $taxaccounts{$item} +=
- $taxamount * $form->{"${item}_rate"} / $taxrate;
- $taxbase{$item} += $taxbase;
+ foreach my $accno (@taxaccounts) {
+ $taxaccounts{$accno} += $taxamount * $form->{"${accno}_rate"} / $taxrate;
+ $taxbase{$accno} += $taxbase;
}
}
- $tax_rate = $taxrate * 100;
- push(@{ $form->{tax_rate} }, qq|$tax_rate|);
+ my $tax_rate = $taxrate * 100;
+ push(@{ $form->{TEMPLATE_ARRAYS}->{tax_rate} }, qq|$tax_rate|);
if ($form->{"assembly_$i"}) {
$sameitem = "";
WHERE (a.bom = '1') AND (a.id = ?) $sortorder|;
$sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id_$i"}));
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
- map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } @arrays));
$sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
- push(@{ $form->{description} }, $sameitem);
+ push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, $sameitem);
}
map { $form->{"a_$_"} = $ref->{$_} } qw(partnumber description);
- push(@{ $form->{description} },
+ push(@{ $form->{TEMPLATE_ARRAYS}->{description} },
$form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}
)
. qq| -- $form->{"a_partnumber"}, $form->{"a_description"}|);
- map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" } @arrays));
}
$sth->finish;
}
foreach my $item (sort keys %taxaccounts) {
- push(@{ $form->{taxbase} },
- $form->format_amount($myconfig, $taxbase{$item}, 2));
-
$tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
- push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
- push(@{ $form->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%});
- push(@{ $form->{taxrate} },
- $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
- push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
+ push(@{ $form->{TEMPLATE_ARRAYS}->{taxbase} }, $form->format_amount($myconfig, $taxbase{$item}, 2));
+ push(@{ $form->{TEMPLATE_ARRAYS}->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
+ push(@{ $form->{TEMPLATE_ARRAYS}->{taxrate} }, $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
+ push(@{ $form->{TEMPLATE_ARRAYS}->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%});
+ push(@{ $form->{TEMPLATE_ARRAYS}->{taxnumber} }, $form->{"${item}_taxnumber"});
}
for my $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
- push(@{ $form->{payment} }, $form->{"paid_$i"});
my ($accno, $description) = split(/--/, $form->{"AR_paid_$i"});
- push(@{ $form->{paymentaccount} }, $description);
- push(@{ $form->{paymentdate} }, $form->{"datepaid_$i"});
- push(@{ $form->{paymentsource} }, $form->{"source_$i"});
+
+ push(@{ $form->{TEMPLATE_ARRAYS}->{payment} }, $form->{"paid_$i"});
+ push(@{ $form->{TEMPLATE_ARRAYS}->{paymentaccount} }, $description);
+ push(@{ $form->{TEMPLATE_ARRAYS}->{paymentdate} }, $form->{"datepaid_$i"});
+ push(@{ $form->{TEMPLATE_ARRAYS}->{paymentsource} }, $form->{"source_$i"});
+ push(@{ $form->{TEMPLATE_ARRAYS}->{paymentmemo} }, $form->{"memo_$i"});
$form->{paid} += $form->parse_amount($myconfig, $form->{"paid_$i"});
}
else {
$form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
}
- $yesdiscount = $form->{nodiscount_total} - $nodiscount;
+
$form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
- $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
- $form->{nodiscount} = $form->format_amount($myconfig, $nodiscount, 2);
- $form->{yesdiscount} = $form->format_amount($myconfig, $yesdiscount, 2);
+ $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
+ $form->{nodiscount} = $form->format_amount($myconfig, $nodiscount, 2);
+ $form->{yesdiscount} = $form->format_amount($myconfig, $form->{nodiscount_total} - $nodiscount, 2);
- $form->{invtotal} =
- ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
- $form->{total} =
- $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
+ $form->{invtotal} = ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
+ $form->{total} = $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
$form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);
- $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
+ $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
+
$form->set_payment_options($myconfig, $form->{invdate});
$form->{username} = $myconfig->{name};
$main::lxdebug->enter_sub();
my ($self, $dbh, $id) = @_;
+ my $form = \%main::form;
my $query = qq|SELECT description FROM project WHERE id = ?|;
my ($description) = selectrow_query($form, $dbh, $query, conv_i($id));
map { $form->{"dv_$_"} = $ref->{$_} } keys %$ref;
}
+
+ my $custom_variables = CVar->get_custom_variables('dbh' => $dbh,
+ 'module' => 'CT',
+ 'trans_id' => $form->{customer_id});
+ map { $form->{"vc_cvar_$_->{name}"} = $_->{value} } @{ $custom_variables };
+
$dbh->disconnect;
$main::lxdebug->leave_sub();
$form->get_employee($dbh);
}
+ $form->{defaultcurrency} = $form->get_default_currency($myconfig);
+
($null, $form->{department_id}) = split(/--/, $form->{department});
my $all_units = AM->retrieve_units($myconfig, $form);
if ($form->{currency} eq $defaultcurrency) {
$form->{exchangerate} = 1;
} else {
- $exchangerate =
- $form->check_exchangerate($myconfig, $form->{currency},
- $form->{transdate}, 'buy');
+ $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy');
}
$form->{exchangerate} =
my %baseunits;
+ $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+ my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
+ my $price_factor;
+
+ $form->{amount_cogs} = {};
+
foreach my $i (1 .. $form->{rowcount}) {
if ($form->{type} eq "credit_note") {
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"}) * -1;
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
}
my $basefactor;
- my $basqty;
+ my $baseqty;
+
+ $form->{"marge_percent_$i"} = $form->parse_amount($myconfig, $form->{"marge_percent_$i"}) * 1;
+ $form->{"marge_total_$i"} = $form->parse_amount($myconfig, $form->{"marge_total_$i"}) * 1;
+ $form->{"lastcost_$i"} = $form->{"lastcost_$i"} * 1;
if ($form->{storno}) {
$form->{"qty_$i"} *= -1;
}
$baseqty = $form->{"qty_$i"} * $basefactor;
- # undo discount formatting
- $form->{"discount_$i"} =
- $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
-
my ($allocated, $taxrate) = (0, 0);
my $taxamount;
+ # add tax rates
+ map { $taxrate += $form->{"${_}_rate"} } split(/ /, $form->{"taxaccounts_$i"});
+
# keep entered selling price
my $fxsellprice =
$form->parse_amount($myconfig, $form->{"sellprice_$i"});
$dec = length $dec;
my $decimalplaces = ($dec > 2) ? $dec : 2;
- # deduct discount
- my $discount =
- $form->round_amount($fxsellprice * $form->{"discount_$i"},
- $decimalplaces);
- $form->{"sellprice_$i"} = $fxsellprice - $discount;
+ # undo discount formatting
+ $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
- # add tax rates
- map({ $taxrate += $form->{"${_}_rate"} } split(/ /,
- $form->{"taxaccounts_$i"}));
+ # deduct discount
+ $form->{"sellprice_$i"} = $fxsellprice * (1 - $form->{"discount_$i"});
# round linetotal to 2 decimal places
- $linetotal =
- $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+ $price_factor = $price_factors{ $form->{"price_factor_id_$i"} } || 1;
+ $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2);
if ($form->{taxincluded}) {
$taxamount = $linetotal * ($taxrate / (1 + $taxrate));
}
# add amount to income, $form->{amount}{trans_id}{accno}
- $amount =
- $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate};
+ $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate} / $price_factor;
- $linetotal =
- $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2) *
- $form->{exchangerate};
+ $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2) * $form->{exchangerate};
$linetotal = $form->round_amount($linetotal, 2);
# this is the difference from the inventory
if ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"}) {
- # adjust parts onhand quantity
-
if ($form->{"assembly_$i"}) {
-
- # do not update if assembly consists of all services
- $query =
- qq|SELECT sum(p.inventory_accno_id)
- FROM parts p
- JOIN assembly a ON (a.parts_id = p.id)
- WHERE a.id = ?|;
- $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id_$i"}));
-
- if ($sth->fetchrow_array) {
- $form->update_balance($dbh, "parts", "onhand", qq|id = ?|,
- $baseqty * -1, $form->{"id_$i"})
- unless $form->{shipped};
- }
- $sth->finish;
-
# record assembly item as allocated
&process_assembly($dbh, $form, $form->{"id_$i"}, $baseqty);
- } else {
- $form->update_balance($dbh, "parts", "onhand", qq|id = ?|,
- $baseqty * -1, $form->{"id_$i"})
- unless $form->{shipped};
+ } else {
$allocated = &cogs($dbh, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i);
}
}
# get pricegroup_id and save it
($null, my $pricegroup_id) = split(/--/, $form->{"sellprice_pg_$i"});
$pricegroup_id *= 1;
- my $subtotal = $form->{"subtotal_$i"} * 1;
# save detail record in invoice table
$query =
qq|INSERT INTO invoice (trans_id, parts_id, description, longdescription, qty,
sellprice, fxsellprice, discount, allocated, assemblyitem,
unit, deliverydate, project_id, serialnumber, pricegroup_id,
- ordnumber, transdate, cusordnumber, base_qty, subtotal)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+ ordnumber, transdate, cusordnumber, base_qty, subtotal,
+ marge_percent, marge_total, lastcost,
+ price_factor_id, price_factor, marge_price_factor)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+ (SELECT factor FROM price_factors WHERE id = ?), ?)|;
@values = (conv_i($form->{id}), conv_i($form->{"id_$i"}),
$form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"},
$form->{"sellprice_$i"}, $fxsellprice,
$form->{"discount_$i"}, $allocated, 'f',
- $form->{"unit_$i"}, conv_date($form->{"deliverydate_$i"}), conv_i($form->{"project_id_$i"}),
+ $form->{"unit_$i"}, conv_date($form->{"reqdate_$i"}), conv_i($form->{"project_id_$i"}),
$form->{"serialnumber_$i"}, conv_i($pricegroup_id),
$form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
- $form->{"cusordnumber_$i"}, $baseqty, $subtotal);
+ $form->{"cusordnumber_$i"}, $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
+ $form->{"marge_percent_$i"}, $form->{"marge_total_$i"},
+ $form->{"lastcost_$i"},
+ conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
+ conv_i($form->{"marge_price_factor_$i"}));
do_query($form, $dbh, $query, @values);
if ($form->{lizenzen} && $form->{"licensenumber_$i"}) {
$project_id = conv_i($form->{"globalproject_id"});
+ foreach my $trans_id (keys %{ $form->{amount_cogs} }) {
+ foreach my $accno (keys %{ $form->{amount_cogs}{$trans_id} }) {
+ next unless ($form->{expense_inventory} =~ /\Q$accno\E/);
+
+ $form->{amount_cogs}{$trans_id}{$accno} = $form->round_amount($form->{amount_cogs}{$trans_id}{$accno}, 2);
+
+ if (!$payments_only && ($form->{amount_cogs}{$trans_id}{$accno} != 0)) {
+ $query =
+ qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id)
+ VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 0, ?)|;
+ @values = (conv_i($trans_id), $accno, $form->{amount_cogs}{$trans_id}{$accno}, conv_date($form->{invdate}), conv_i($project_id));
+ do_query($form, $dbh, $query, @values);
+ $form->{amount_cogs}{$trans_id}{$accno} = 0;
+ }
+ }
+
+ foreach my $accno (keys %{ $form->{amount_cogs}{$trans_id} }) {
+ $form->{amount_cogs}{$trans_id}{$accno} = $form->round_amount($form->{amount_cogs}{$trans_id}{$accno}, 2);
+
+ if (!$payments_only && ($form->{amount_cogs}{$trans_id}{$accno} != 0)) {
+ $query =
+ qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id)
+ VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 0, ?)|;
+ @values = (conv_i($trans_id), $accno, $form->{amount_cogs}{$trans_id}{$accno}, conv_date($form->{invdate}), conv_i($project_id));
+ do_query($form, $dbh, $query, @values);
+ }
+ }
+ }
+
foreach my $trans_id (keys %{ $form->{amount} }) {
foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
- next unless ($form->{expense_inventory} =~ /$accno/);
+ next unless ($form->{expense_inventory} =~ /\Q$accno\E/);
$form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2);
if ($form->{currency} eq $defaultcurrency) {
$form->{"exchangerate_$i"} = 1;
} else {
- $exchangerate =
- $form->check_exchangerate($myconfig, $form->{currency},
- $form->{"datepaid_$i"}, 'buy');
-
- $form->{"exchangerate_$i"} =
- $exchangerate ? $exchangerate
- : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
+ $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+ $form->{"exchangerate_$i"} = $exchangerate || $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
}
# record AR
$form->{"exchangerate_$i"}, 0);
}
}
+
+ } else { # if (!$form->{storno})
+ $form->{marge_total} *= -1;
}
if ($payments_only) {
$amount = $netamount + $tax;
- # fill in subject if there is none
- $form->{subject} = qq|$form->{label} $form->{invnumber}|
- unless $form->{subject};
-
- # if there is a message stuff it into the intnotes
- my $cc = "Cc: $form->{cc}\\r\n" if $form->{cc};
- my $bcc = "Bcc: $form->{bcc}\\r\n" if $form->{bcc};
- my $now = scalar localtime;
- $form->{intnotes} .= qq|\r
-\r| if $form->{intnotes};
-
- $form->{intnotes} .= qq|[email]\r
-Date: $now
-To: $form->{email}\r
-$cc${bcc}Subject: $form->{subject}\r
-\r
-Message: $form->{message}\r| if $form->{message};
-
# save AR record
+ #erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb
+
$query = qq|UPDATE ar set
- invnumber = ?,
- ordnumber = ?,
- quonumber = ?,
- cusordnumber = ?,
- transdate = ?,
- orddate = ?,
- quodate = ?,
- customer_id = ?,
- amount = ?,
- netamount = ?,
- paid = ?,
- datepaid = ?,
- duedate = ?,
- deliverydate = ?,
- invoice = '1',
- shippingpoint = ?,
- shipvia = ?,
- terms = ?,
- notes = ?,
- intnotes = ?,
- taxincluded = ?,
- curr = ?,
- department_id = ?,
- payment_id = ?,
- type = ?,
- language_id = ?,
- taxzone_id = ?,
- shipto_id = ?,
- delivery_customer_id = ?,
- delivery_vendor_id = ?,
- employee_id = ?,
- salesman_id = ?,
- storno = ?,
- globalproject_id = ?,
- cp_id = ?,
- transaction_description = ?
+ invnumber = ?, ordnumber = ?, quonumber = ?, cusordnumber = ?,
+ transdate = ?, orddate = ?, quodate = ?, customer_id = ?,
+ amount = ?, netamount = ?, paid = ?, datepaid = ?,
+ duedate = ?, deliverydate = ?, invoice = ?, shippingpoint = ?,
+ shipvia = ?, terms = ?, notes = ?, intnotes = ?,
+ curr = ?, department_id = ?, payment_id = ?, taxincluded = ?,
+ type = ?, language_id = ?, taxzone_id = ?, shipto_id = ?,
+ employee_id = ?, salesman_id = ?, storno_id = ?, storno = ?,
+ cp_id = ?, marge_total = ?, marge_percent = ?,
+ globalproject_id = ?, delivery_customer_id = ?,
+ transaction_description = ?, delivery_vendor_id = ?,
+ donumber = ?
WHERE id = ?|;
- @values = ($form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
- conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}),
- conv_i($form->{"customer_id"}), $amount, $netamount, $form->{"paid"},
- conv_date($form->{"datepaid"}), conv_date($form->{"duedate"}), conv_date($form->{"deliverydate"}),
- $form->{"shippingpoint"}, $form->{"shipvia"}, conv_i($form->{"terms"}),
- $form->{"notes"}, $form->{"intnotes"}, $form->{"taxincluded"} ? 't' : 'f',
- $form->{"currency"}, conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}),
- $form->{"type"}, conv_i($form->{"language_id"}), conv_i($form->{"taxzone_id"}),
- conv_i($form->{"shipto_id"}),
- conv_i($form->{"delivery_customer_id"}), conv_i($form->{"delivery_vendor_id"}),
- conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),
- $form->{"storno"} ? 't' : 'f', conv_i($form->{"globalproject_id"}),
- conv_i($form->{"cp_id"}), $form->{transaction_description},
- conv_i($form->{"id"}));
+ @values = ( $form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
+ conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}), conv_i($form->{"customer_id"}),
+ $amount, $netamount, $form->{"paid"}, conv_date($form->{"datepaid"}),
+ conv_date($form->{"duedate"}), conv_date($form->{"deliverydate"}), '1', $form->{"shippingpoint"},
+ $form->{"shipvia"}, conv_i($form->{"terms"}), $form->{"notes"}, $form->{"intnotes"},
+ $form->{"currency"}, conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}), $form->{"taxincluded"} ? 't' : 'f',
+ $form->{"type"}, conv_i($form->{"language_id"}), conv_i($form->{"taxzone_id"}), conv_i($form->{"shipto_id"}),
+ conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}), conv_i($form->{storno_id}), $form->{"storno"} ? 't' : 'f',
+ conv_i($form->{"cp_id"}), 1 * $form->{marge_total} , 1 * $form->{marge_percent},
+ conv_i($form->{"globalproject_id"}), conv_i($form->{"delivery_customer_id"}),
+ $form->{transaction_description}, conv_i($form->{"delivery_vendor_id"}),
+ $form->{"donumber"}, #das entsprechende feld lieferscheinnummer aus der html-form 12.02.09 jb
+ conv_i($form->{"id"}));
do_query($form, $dbh, $query, @values);
-
+
if($form->{"formname"} eq "credit_note") {
- for my $i (1 .. $form->{paidaccounts}) {
+ for my $i (1 .. $form->{rowcount}) {
$query = qq|UPDATE parts SET onhand = onhand - ? WHERE id = ?|;
@values = (conv_i($form->{"qty_$i"}), conv_i($form->{"id_$i"}));
do_query($form, $dbh, $query, @values);
}
}
-
+
if ($form->{storno}) {
$query =
qq!UPDATE ar SET
# add shipto
$form->{name} = $form->{customer};
- $form->{name} =~ s/--$form->{customer_id}//;
+ $form->{name} =~ s/--\Q$form->{customer_id}\E//;
if (!$form->{shipto_id}) {
$form->add_shipto($dbh, $form->{id}, "AR");
Common::webdav_folder($form) if ($main::webdav);
+ # Link this record to the records it was created from.
+ RecordLinks->create_links('dbh' => $dbh,
+ 'mode' => 'ids',
+ 'from_table' => 'oe',
+ 'from_ids' => $form->{convert_from_oe_ids},
+ 'to_table' => 'ar',
+ 'to_id' => $form->{id},
+ );
+ delete $form->{convert_from_oe_ids};
+
+ my @convert_from_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{convert_from_do_ids};
+
+ if (scalar @convert_from_do_ids) {
+ DO->close_orders('dbh' => $dbh,
+ 'ids' => \@convert_from_do_ids);
+
+ RecordLinks->create_links('dbh' => $dbh,
+ 'mode' => 'ids',
+ 'from_table' => 'delivery_orders',
+ 'from_ids' => \@convert_from_do_ids,
+ 'to_table' => 'ar',
+ 'to_id' => $form->{id},
+ );
+ }
+ delete $form->{convert_from_do_ids};
+
+ ARAP->close_orders_if_billed('dbh' => $dbh,
+ 'arap_id' => $form->{id},
+ 'table' => 'ar',);
+
my $rc = 1;
if (!$provided_dbh) {
$dbh->commit();
# Delete all entries in acc_trans from prior payments.
$self->_delete_payments($form, $dbh);
- my @after_dp;
- push @after_dp, selectall_hashref_query($form, $dbh, qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid|, $form->{id});
-
# Save the new payments the user made before cleaning up $form.
map { $payments{$_} = $form->{$_} } grep m/^datepaid_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^AR_paid_\d+$|^paidaccounts$/, keys %{ $form };
# Retrieve the invoice from the database.
$self->retrieve_invoice($myconfig, $form);
- # Set up the content of $form in the way that IR::post_invoice() expects.
+ # Set up the content of $form in the way that IS::post_invoice() expects.
$form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate});
for $row (1 .. scalar @{ $form->{invoice_details} }) {
# Restore the payment options from the user input.
map { $form->{$_} = $payments{$_} } keys %payments;
- # Get the AP accno (which is normally done by Form::create_links()).
+ # Get the AR accno (which is normally done by Form::create_links()).
$query =
qq|SELECT c.accno
FROM acc_trans at
WHERE (a.id = ?)|;
my $sth = prepare_execute_query($form, $dbh, $query, conv_i($id));
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
my $allocated = 0;
$query =
qq|INSERT INTO invoice (trans_id, description, parts_id, qty, sellprice, fxsellprice, allocated, assemblyitem, unit)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)|;
- @values = (conv_i($form->{id}), $ref->{description}, conv_i($ref->{parts_id}), $ref->{qty}, 0, 0, $allocated, 't', $ref->{unit});
+ my @values = (conv_i($form->{id}), $ref->{description}, conv_i($ref->{parts_id}), $ref->{qty}, 0, 0, $allocated, 't', $ref->{unit});
do_query($form, $dbh, $query, @values);
}
$main::lxdebug->enter_sub();
my ($dbh, $form, $id, $totalqty, $basefactor, $row) = @_;
+
+ $basefactor ||= 1;
+
$form->{taxzone_id} *=1;
my $transdate = $form->{invdate} ? $dbh->quote($form->{invdate}) : "current_date";
my $taxzone_id = $form->{"taxzone_id"} * 1;
my $query =
qq|SELECT i.id, i.trans_id, i.base_qty, i.allocated, i.sellprice,
-
- c1.accno AS inventory_accno,
- c1.new_chart_id AS inventory_new_chart,
- date($transdate) - c1.valid_from AS inventory_valid,
-
- c2.accno AS income_accno,
- c2.new_chart_id AS income_new_chart,
- date($transdate) - c2.valid_from AS income_valid,
-
- c3.accno AS expense_accno,
- c3.new_chart_id AS expense_new_chart,
- date($transdate) - c3.valid_from AS expense_valid
-
+ c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from AS inventory_valid,
+ c2.accno AS income_accno, c2.new_chart_id AS income_new_chart, date($transdate) - c2.valid_from AS income_valid,
+ c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from AS expense_valid
FROM invoice i, parts p
LEFT JOIN chart c1 ON ((SELECT inventory_accno_id FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id)
LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
my $allocated = 0;
my $qty;
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
if (($qty = (($ref->{base_qty} * -1) - $ref->{allocated})) > $totalqty) {
$qty = $totalqty;
}
# total expenses and inventory
# sellprice is the cost of the item
- $linetotal = $form->round_amount(($ref->{sellprice} * $qty) / $basefactor, 2);
+ my $linetotal = $form->round_amount(($ref->{sellprice} * $qty) / ( $basefactor || 1 ), 2);
if (!$main::eur) {
$ref->{expense_accno} = ($form->{"expense_accno_$row"}) ? $form->{"expense_accno_$row"} : $ref->{expense_accno};
# add to expense
- $form->{amount}{ $form->{id} }{ $ref->{expense_accno} } += -$linetotal;
+ $form->{amount_cogs}{ $form->{id} }{ $ref->{expense_accno} } += -$linetotal;
$form->{expense_inventory} .= " " . $ref->{expense_accno};
$ref->{inventory_accno} = ($form->{"inventory_accno_$row"}) ? $form->{"inventory_accno_$row"} : $ref->{inventory_accno};
# deduct inventory
- $form->{amount}{ $form->{id} }{ $ref->{inventory_accno} } -= -$linetotal;
+ $form->{amount_cogs}{ $form->{id} }{ $ref->{inventory_accno} } -= -$linetotal;
$form->{expense_inventory} .= " " . $ref->{inventory_accno};
}
WHERE i.trans_id = ?|;
my $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{"id"}));
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
- if ($ref->{inventory_accno_id} || $ref->{assembly}) {
-
- # if the invoice item is not an assemblyitem adjust parts onhand
- if (!$ref->{assemblyitem}) {
-
- # adjust onhand in parts table
- $form->update_balance($dbh, "parts", "onhand", qq|id = $ref->{parts_id}|, $ref->{qty});
- }
-
- # loop if it is an assembly
- next if ($ref->{assembly});
+ while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
+ if ($ref->{inventory_accno_id}) {
# de-allocated purchases
$query =
qq|SELECT i.id, i.trans_id, i.allocated
ORDER BY i.trans_id DESC|;
my $sth2 = prepare_execute_query($form, $dbh, $query, conv_i($ref->{"parts_id"}));
- while (my $inhref = $sth2->fetchrow_hashref(NAME_lc)) {
- $qty = $ref->{qty};
+ while (my $inhref = $sth2->fetchrow_hashref('NAME_lc')) {
+ my $qty = $ref->{qty};
if (($ref->{qty} - $inhref->{allocated}) > 0) {
$qty = $inhref->{allocated};
}
$sth->finish;
# delete acc_trans
- @values = (conv_i($form->{id}));
+ my @values = (conv_i($form->{id}));
do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE trans_id = ?|, @values);
do_query($form, $dbh, qq|DELETE FROM invoice WHERE trans_id = ?|, @values);
$dbh->disconnect;
if ($rc) {
- map { unlink "$spool/$_" if -f "$spool/$_"; } @{ $spoolfiles };
+ map { unlink "$spool/$_" if -f "$spool/$_"; } @spoolfiles;
}
$main::lxdebug->leave_sub();
my $id = conv_i($form->{id});
# retrieve invoice
+ #erweiterung um das entsprechende feld lieferscheinnummer (a.donumber) in der html-maske anzuzeigen 12.02.2009 jb
+
$query =
qq|SELECT
a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
a.employee_id, a.salesman_id, a.payment_id,
a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
a.transaction_description,
- e.name AS employee
+ a.marge_total, a.marge_percent,
+ e.name AS employee, a.donumber
FROM ar a
LEFT JOIN employee e ON (e.id = a.employee_id)
WHERE a.id = ?|;
map { $form->{$_} = $ref->{$_} } keys %{ $ref };
- $form->{exchangerate} =
- $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
+ $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
# get shipto
$query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module = 'AR')|;
foreach my $vc (qw(customer vendor)) {
next if !$form->{"delivery_${vc}_id"};
- ($form->{"delivery_${vc}_string"})
- = selectrow_query($form, $dbh, qq|SELECT name FROM customer WHERE id = ?|, $id);
+ ($form->{"delivery_${vc}_string"}) = selectrow_query($form, $dbh, qq|SELECT name FROM customer WHERE id = ?|, $id);
}
# get printed, emailed
- $query =
- qq|SELECT printed, emailed, spoolfile, formname
- FROM status
- WHERE trans_id = ?|;
+ $query = qq|SELECT printed, emailed, spoolfile, formname FROM status WHERE trans_id = ?|;
$sth = prepare_execute_query($form, $dbh, $query, $id);
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref('NAME_lc')) {
$form->{printed} .= "$ref->{formname} " if $ref->{printed};
$form->{emailed} .= "$ref->{formname} " if $ref->{emailed};
- $form->{queued} .= "$ref->{formname} $ref->{spoolfile} "
- if $ref->{spoolfile};
+ $form->{queued} .= "$ref->{formname} $ref->{spoolfile} " if $ref->{spoolfile};
}
$sth->finish;
map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
- my $transdate =
- $form->{deliverydate} ? $dbh->quote($form->{deliverydate}) :
- $form->{invdate} ? $dbh->quote($form->{invdate}) :
- "current_date";
+ my $transdate = $form->{deliverydate} ? $dbh->quote($form->{deliverydate})
+ : $form->{invdate} ? $dbh->quote($form->{invdate})
+ : "current_date";
+
my $taxzone_id = $form->{taxzone_id} *= 1;
$taxzone_id = 0 if (0 > $taxzone_id) || (3 < $taxzone_id);
# retrieve individual items
$query =
qq|SELECT
- c1.accno AS inventory_accno,
- c1.new_chart_id AS inventory_new_chart,
- date($transdate) - c1.valid_from AS inventory_valid,
-
- c2.accno AS income_accno,
- c2.new_chart_id AS income_new_chart,
- date($transdate) - c2.valid_from as income_valid,
-
- c3.accno AS expense_accno,
- c3.new_chart_id AS expense_new_chart,
- date($transdate) - c3.valid_from AS expense_valid,
-
- i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice,
- i.discount, i.parts_id AS id, i.unit, i.deliverydate,
- i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id,
- i.ordnumber, i.transdate, i.cusordnumber, i.subtotal,
+ c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from AS inventory_valid,
+ c2.accno AS income_accno, c2.new_chart_id AS income_new_chart, date($transdate) - c2.valid_from as income_valid,
+ c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from AS expense_valid,
- p.partnumber, p.assembly, p.bin, p.notes AS partnotes,
- p.inventory_accno_id AS part_inventory_accno_id, p.formel,
-
- pr.projectnumber,
- pg.partsgroup,
- prg.pricegroup
+ i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.discount, i.parts_id AS id, i.unit, i.deliverydate AS reqdate,
+ i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id, i.ordnumber, i.transdate, i.cusordnumber, i.subtotal, i.lastcost,
+ i.price_factor_id, i.price_factor, i.marge_price_factor,
+ p.partnumber, p.assembly, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, p.formel,
+ pr.projectnumber, pg.partsgroup, prg.pricegroup
FROM invoice i
LEFT JOIN parts p ON (i.parts_id = p.id)
LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
LEFT JOIN pricegroup prg ON (i.pricegroup_id = prg.id)
- LEFT JOIN chart c1 ON
- ((SELECT inventory_accno_id
- FROM buchungsgruppen
- WHERE id = p.buchungsgruppen_id) = c1.id)
- LEFT JOIN chart c2 ON
- ((SELECT income_accno_id_${taxzone_id}
- FROM buchungsgruppen
- WHERE id=p.buchungsgruppen_id) = c2.id)
- LEFT JOIN chart c3 ON
- ((SELECT expense_accno_id_${taxzone_id}
- FROM buchungsgruppen
- WHERE id = p.buchungsgruppen_id) = c3.id)
-
- WHERE (i.trans_id = ?)
- AND NOT (i.assemblyitem = '1')
- ORDER BY i.id|;
+ LEFT JOIN chart c1 ON ((SELECT inventory_accno_id FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id)
+ LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
+ LEFT JOIN chart c3 ON ((SELECT expense_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c3.id)
+
+ WHERE (i.trans_id = ?) AND NOT (i.assemblyitem = '1') ORDER BY i.id|;
$sth = prepare_execute_query($form, $dbh, $query, $id);
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- if (!$ref->{"part_inventory_accno_id"}) {
- map({ delete($ref->{$_}); } qw(inventory_accno inventory_new_chart inventory_valid));
- }
+ while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
+ map({ delete($ref->{$_}); } qw(inventory_accno inventory_new_chart inventory_valid)) if !$ref->{"part_inventory_accno_id"};
delete($ref->{"part_inventory_accno_id"});
foreach my $type (qw(inventory income expense)) {
while ($ref->{"${type}_new_chart"} && ($ref->{"${type}_valid"} >=0)) {
- my $query =
- qq|SELECT accno, new_chart_id, date($transdate) - valid_from
- FROM chart
- WHERE id = ?|;
- ($ref->{"${type}_accno"},
- $ref->{"${type}_new_chart"},
- $ref->{"${type}_valid"})
- = selectrow_query($form, $dbh, $query, $ref->{"${type}_new_chart"});
+ my $query = qq|SELECT accno, new_chart_id, date($transdate) - valid_from FROM chart WHERE id = ?|;
+ @$ref{ map $type.$_, qw(_accno _new_chart _valid) } = selectrow_query($form, $dbh, $query, $ref->{"${type}_new_chart"});
}
}
# get tax rates and description
- my $accno_id =
- ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+ my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
$query =
- qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
- FROM tax t
+ qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber FROM tax t
LEFT JOIN chart c ON (c.id = t.chart_id)
WHERE t.id IN
- (SELECT tk.tax_id
- FROM taxkeys tk
+ (SELECT tk.tax_id FROM taxkeys tk
WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
AND startdate <= date($transdate)
- ORDER BY startdate DESC
- LIMIT 1)
+ ORDER BY startdate DESC LIMIT 1)
ORDER BY c.accno|;
my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
$ref->{taxaccounts} = "";
my $i=0;
- while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
+ while (my $ptr = $stw->fetchrow_hashref('NAME_lc')) {
- # if ($customertax{$ref->{accno}}) {
if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
$i++;
$ptr->{accno} = $i;
}
$ref->{taxaccounts} .= "$ptr->{accno} ";
- if (!($form->{taxaccounts} =~ /$ptr->{accno}/)) {
+ if (!($form->{taxaccounts} =~ /\Q$ptr->{accno}\E/)) {
$form->{"$ptr->{accno}_rate"} = $ptr->{rate};
$form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
$form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
}
if ($form->{lizenzen}) {
- $query =
- qq|SELECT l.licensenumber, l.id AS licenseid
- FROM license l, licenseinvoice li
- WHERE l.id = li.license_id AND li.trans_id = ?|;
- my ($licensenumber, $licenseid)
- = selectrow_query($form, $dbh, $query, conv_i($ref->{invoice_pos}));
+ $query = qq|SELECT l.licensenumber, l.id AS licenseid FROM license l, licenseinvoice li WHERE l.id = li.license_id AND li.trans_id = ?|;
+ my ($licensenumber, $licenseid) = selectrow_query($form, $dbh, $query, conv_i($ref->{invoice_pos}));
$ref->{lizenzen} = "<option value=\"$licenseid\">$licensenumber</option>";
}
}
my $cid = conv_i($form->{customer_id});
+ my $payment_id;
+
+ if ($form->{payment_id}) {
+ $payment_id = "(pt.id = ?) OR";
+ push @values, conv_i($form->{payment_id});
+ }
# get customer
$query =
qq|SELECT
- c.name AS customer, c.discount, c.creditlimit, c.terms,
- c.email, c.cc, c.bcc, c.language_id, c.payment_id AS customer_payment_id,
+ c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit, c.terms,
+ c.email, c.cc, c.bcc, c.language_id, c.payment_id,
c.street, c.zipcode, c.city, c.country,
c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id,
$duedate + COALESCE(pt.terms_netto, 0) AS duedate,
b.discount AS tradediscount, b.description AS business
FROM customer c
LEFT JOIN business b ON (b.id = c.business_id)
- LEFT JOIN payment_terms pt ON (c.payment_id = pt.id)
+ LEFT JOIN payment_terms pt ON ($payment_id (c.payment_id = pt.id))
WHERE c.id = ?|;
push @values, $cid;
$ref = selectfirst_hashref_query($form, $dbh, $query, @values);
$ref = selectfirst_hashref_query($form, $dbh, $query, $cid);
map { $form->{$_} = $ref->{$_} } keys %$ref;
- #check whether payment_terms are better than old payment_terms
- if (($form->{payment_id} ne "") && ($form->{customer_payment_id} ne "")) {
- $query =
- qq|SELECT
- (SELECT ranking FROM payment_terms WHERE id = ?),
- (SELECT ranking FROM payment_terms WHERE id = ?)|;
- my ($old_ranking, $new_ranking)
- = selectrow_query($form, $dbh, $query, conv_i($form->{payment_id}), conv_i($form->{customer_payment_id}));
- if ($new_ranking > $old_ranking) {
- $form->{payment_id} = $form->{customer_payment_id};
- }
- }
-
- if ($form->{payment_id} eq "") {
- $form->{payment_id} = $form->{customer_payment_id};
- }
-
$form->{creditremaining} = $form->{creditlimit};
$query = qq|SELECT SUM(amount - paid) FROM ar WHERE customer_id = ?|;
my ($value) = selectrow_query($form, $dbh, $query, $cid);
WHERE o.customer_id = ?
AND o.quotation = '0'
AND o.closed = '0'|;
- $sth = prepare_execute_query($form, $dbh, $query, $cid);
+ my $sth = prepare_execute_query($form, $dbh, $query, $cid);
while (my ($amount, $exch) = $sth->fetchrow_array) {
$exch = 1 unless $exch;
$sth = prepare_execute_query($form, $dbh, $query, $cid, $cid);
my $i = 0;
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref('NAME_lc')) {
if ($ref->{category} eq 'I') {
$i++;
$form->{"AR_amount_$i"} = "$ref->{accno}--$ref->{description}";
my $where = qq|NOT p.obsolete = '1'|;
my @values;
- foreach my $column (qw(p.partnumber p.description pgpartsgroup)) {
+ foreach my $column (qw(p.partnumber p.description pgpartsgroup )) {
my ($table, $field) = split m/\./, $column;
next if !$form->{"${field}_${i}"};
$where .= qq| AND lower(${column}) ILIKE ?|;
push @values, '%' . $form->{"${field}_${i}"} . '%';
}
+ #Es soll auch nach EAN gesucht werden, ohne Einschränkung durch Beschreibung
+ if ($form->{"partnumber_$i"} && !$form->{"description_$i"}) {
+ $where .= qq| OR (NOT p.obsolete = '1' AND p.ean = ? )|;
+ push @values, $form->{"partnumber_$i"};
+ }
+
if ($form->{"description_$i"}) {
$where .= qq| ORDER BY p.description|;
} else {
my $query =
qq|SELECT
p.id, p.partnumber, p.description, p.sellprice,
- p.listprice, p.inventory_accno_id,
+ p.listprice, p.inventory_accno_id, p.lastcost,
c1.accno AS inventory_accno,
c1.new_chart_id AS inventory_new_chart,
p.unit, p.assembly, p.bin, p.onhand,
p.notes AS partnotes, p.notes AS longdescription,
p.not_discountable, p.formel, p.payment_id AS part_payment_id,
+ p.price_factor_id,
+
+ pfac.factor AS price_factor,
pg.partsgroup
FROM buchungsgruppen
WHERE id = p.buchungsgruppen_id) = c3.id)
LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
+ LEFT JOIN price_factors pfac ON (pfac.id = p.price_factor_id)
WHERE $where|;
my $sth = prepare_execute_query($form, $dbh, $query, @values);
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref('NAME_lc')) {
# In der Buchungsgruppe ist immer ein Bestandskonto verknuepft, auch wenn
# es sich um eine Dienstleistung handelt. Bei Dienstleistungen muss das
}
}
- #check whether payment_terms are better than old payment_terms
- if (($form->{payment_id} ne "") && ($form->{part_payment_id} ne "")) {
- $query =
- qq|SELECT
- (SELECT ranking FROM payment_terms WHERE id = ?),
- (SELECT ranking FROM payment_terms WHERE id = ?)|;
- my ($old_ranking, $new_ranking)
- = selectrow_query($form, $dbh, $query, conv_i($form->{payment_id}), conv_i($form->{part_payment_id}));
- if ($new_ranking > $old_ranking) {
- $form->{payment_id} = $form->{customer_payment_id};
- }
- }
-
if ($form->{payment_id} eq "") {
$form->{payment_id} = $form->{part_payment_id};
}
# get tax rates and description
- $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+ my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
$query =
qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
FROM tax t
LIMIT 1)
ORDER BY c.accno|;
@values = ($accno_id, $transdate eq "current_date" ? "now" : $transdate);
- $stw = $dbh->prepare($query);
+ my $stw = $dbh->prepare($query);
$stw->execute(@values) || $form->dberror($query);
$ref->{taxaccounts} = "";
my $i = 0;
- while ($ptr = $stw->fetchrow_hashref(NAME_lc)) {
+ while (my $ptr = $stw->fetchrow_hashref('NAME_lc')) {
- # if ($customertax{$ref->{accno}}) {
+ # if ($customertax{$ref->{accno}})
if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
$i++;
$ptr->{accno} = $i;
}
$ref->{taxaccounts} .= "$ptr->{accno} ";
- if (!($form->{taxaccounts} =~ /$ptr->{accno}/)) {
+ if (!($form->{taxaccounts} =~ /\Q$ptr->{accno}\E/)) {
$form->{"$ptr->{accno}_rate"} = $ptr->{rate};
$form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
$form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
}
}
+ $ref->{onhand} *= 1;
+
push @{ $form->{item_list} }, $ref;
if ($form->{lizenzen}) {
FROM license l
WHERE l.parts_id = ? AND NOT l.id IN (SELECT li.license_id FROM licenseinvoice li)|;
my $stw = prepare_execute_query($form, $dbh, $query, conv_i($ref->{id}));
- while (my $ptr = $stw->fetchrow_hashref(NAME_lc)) {
+ while (my $ptr = $stw->fetchrow_hashref('NAME_lc')) {
push @{ $form->{LIZENZEN}{ $ref->{id} } }, $ptr;
}
$stw->finish;
my $i = 1;
my $id = 0;
- my $dimension_units = AM->retrieve_units($myconfig, $form, "dimension");
- my $service_units = AM->retrieve_units($myconfig, $form, "service");
my $all_units = AM->retrieve_units($myconfig, $form);
while (($form->{"id_$i"}) or ($form->{"new_id_$i"})) {
$form->{"PRICES"}{$i} = [];
$id = $form->{"new_id_$i"};
}
- ($price, $selectedpricegroup_id) = split(/--/,
+ my ($price, $selectedpricegroup_id) = split(/--/,
$form->{"sellprice_pg_$i"});
- $pricegroup_old = $form->{"pricegroup_old_$i"};
+ my $pricegroup_old = $form->{"pricegroup_old_$i"};
$form->{"new_pricegroup_$i"} = $selectedpricegroup_id;
$form->{"old_pricegroup_$i"} = $pricegroup_old;
- $price_new = $form->{"price_new_$i"};
- $price_old = $form->{"price_old_$i"};
+ my $price_new = $form->{"price_new_$i"};
+ my $price_old = $form->{"price_old_$i"};
if (!$form->{"unit_old_$i"}) {
# Neue Ware aus der Datenbank. In diesem Fall ist unit_$i die
# vergleichen und bei Unterschied den Preis entsprechend umrechnen.
$form->{"selected_unit_$i"} = $form->{"unit_$i"} unless ($form->{"selected_unit_$i"});
- my $check_units = $form->{"inventory_accno_$i"} ? $dimension_units : $service_units;
- if (!$check_units->{$form->{"selected_unit_$i"}} ||
- ($check_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne
+ if (!$all_units->{$form->{"selected_unit_$i"}} ||
+ ($all_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne
$all_units->{$form->{"unit_old_$i"}}->{"base_unit"})) {
# Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
# (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
$form->{"basefactor_$i"} = 1;
}
- $query =
+ my $query =
qq|SELECT
pricegroup_id,
(SELECT p.sellprice FROM parts p WHERE p.id = ?) AS default_sellprice,
FROM prices
ORDER BY pricegroup|;
- @values = (conv_i($id), conv_i($id), conv_i($id), conv_i($id));
+ my @values = (conv_i($id), conv_i($id), conv_i($id), conv_i($id));
my $pkq = prepare_execute_query($form, $dbh, $query, @values);
- while ($pkr = $pkq->fetchrow_hashref(NAME_lc)) {
+ while (my $pkr = $pkq->fetchrow_hashref('NAME_lc')) {
$pkr->{id} = $id;
$pkr->{selected} = '';
} else {
- $form->{"sellprice_$i"} = $pkr->{price};
+# this sub should not set anything and only return. --sschoeling, 20090506
+# $form->{"sellprice_$i"} = $pkr->{price};
}
} elsif ($pkr->{price} == $pkr->{default_sellprice}) {
sub is_storno {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $form, $table) = @_;
+ my ($self, $myconfig, $form, $table, $id) = @_;
- $main::lxdebug->leave_sub() and return 0 unless ($form->{id});
+ $main::lxdebug->leave_sub() and return 0 unless ($id);
# make sure there's no funny stuff in $table
# ToDO: die when this happens and throw an error
my $dbh = $form->dbconnect($myconfig);
my $query = qq|SELECT storno FROM $table WHERE id = ?|;
- my ($result) = selectrow_query($form, $dbh, $query, $form->{id});
+ my ($result) = selectrow_query($form, $dbh, $query, $id);
$dbh->disconnect();
projects / kivitendo-erp.git / blobdiff