package OE;
+use List::Util qw(max);
+
use SL::AM;
use SL::Common;
use SL::DBUtils;
qq| o.marge_total, o.marge_percent, | .
qq| ex.$rate AS exchangerate, | .
qq| pr.projectnumber AS globalprojectnumber, | .
- qq| e.name AS employee | .
+ qq| e.name AS employee, s.name AS salesman | .
qq|FROM oe o | .
qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
+ qq|LEFT JOIN employee s ON (o.salesman_id = s.id) | .
qq|LEFT JOIN exchangerate ex ON (ex.curr = o.curr | .
qq| AND ex.transdate = o.transdate) | .
qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
$query .= " AND o.employee_id = ?";
push @values, conv_i($form->{employee_id});
}
+
+ if ($form->{salesman_id}) {
+ $query .= " AND o.salesman_id = ?";
+ push @values, conv_i($form->{salesman_id});
+ }
if (!$form->{open} && !$form->{closed}) {
$query .= " AND o.id = 0";
}
my $sortorder = join(', ', ("o.id", $form->sort_columns("transdate", $ordnumber, "name")));
- my %allowed_sort_columns =
- ("transdate" => "o.transdate",
- "reqdate" => "o.reqdate",
- "id" => "o.id",
- "ordnumber" => "o.ordnumber",
- "quonumber" => "o.quonumber",
- "name" => "ct.name",
- "employee" => "e.name",
- "shipvia" => "o.shipvia",
- "transaction_description" => "o.transaction_description");
+ my %allowed_sort_columns = (
+ "transdate" => "o.transdate",
+ "reqdate" => "o.reqdate",
+ "id" => "o.id",
+ "ordnumber" => "o.ordnumber",
+ "quonumber" => "o.quonumber",
+ "name" => "ct.name",
+ "employee" => "e.name",
+ "salesman" => "e.name",
+ "shipvia" => "o.shipvia",
+ "transaction_description" => "o.transaction_description"
+ );
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
$sortorder = $allowed_sort_columns{$form->{sort}};
}
my %taxaccounts;
my $netamount = 0;
+ $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+ my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
+ my $price_factor;
+
for my $i (1 .. $form->{rowcount}) {
map({ $form->{"${_}_$i"} =
my $baseqty = $form->{"qty_$i"} * $basefactor;
$form->{"marge_percent_$i"} = $form->parse_amount($myconfig, $form->{"marge_percent_$i"}) * 1;
- $form->{"marge_absolut_$i"} = $form->parse_amount($myconfig, $form->{"marge_absolut_$i"}) * 1;
+ $form->{"marge_total_$i"} = $form->parse_amount($myconfig, $form->{"marge_total_$i"}) * 1;
$form->{"lastcost_$i"} = $form->{"lastcost_$i"} * 1;
# set values to 0 if nothing entered
$form->{"inventory_accno_$i"} *= 1;
$form->{"expense_accno_$i"} *= 1;
- $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);
@taxaccounts = split(/ /, $form->{"taxaccounts_$i"});
$taxrate = 0;
}
}
- $netamount += $form->{"sellprice_$i"} * $form->{"qty_$i"};
+ $netamount += $form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor;
$reqdate =
($form->{"reqdate_$i"}) ? $form->{"reqdate_$i"} : undef;
$query .= qq|trans_id, parts_id, description, longdescription, qty, base_qty, | .
qq|sellprice, discount, unit, reqdate, project_id, serialnumber, ship, | .
qq|pricegroup_id, ordnumber, transdate, cusordnumber, subtotal, | .
- qq|marge_percent, marge_total, lastcost) | .
+ qq|marge_percent, marge_total, lastcost, price_factor_id, price_factor, marge_price_factor) | .
qq|VALUES (|;
if($form->{"orderitems_id_$i"}) {
$query .= qq|?,|;
push(@values, $form->{"orderitems_id_$i"});
}
- $query .= qq|?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+ $query .= qq|?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+ (SELECT factor FROM price_factors WHERE id = ?), ?)|;
push(@values,
conv_i($form->{id}), conv_i($form->{"id_$i"}),
$form->{"description_$i"}, $form->{"longdescription_$i"},
$form->{"serialnumber_$i"}, $form->{"ship_$i"}, conv_i($pricegroup_id),
$form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
$form->{"cusordnumber_$i"}, $form->{"subtotal_$i"} ? 't' : 'f',
- $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
- $form->{"lastcost_$i"});
+ $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);
$form->{"sellprice_$i"} = $fxsellprice;
# add shipto
$form->{name} = $form->{ $form->{vc} };
- $form->{name} =~ s/--$form->{"$form->{vc}_id"}//;
+ $form->{name} =~ s/--\Q$form->{"$form->{vc}_id"}\E//;
if (!$form->{shipto_id}) {
$form->add_shipto($dbh, $form->{id}, "OE");
my ($self, $myconfig, $form) = @_;
- $main::lxdebug->leave_sub() unless ($form->{"id"});
+ return $main::lxdebug->leave_sub() unless ($form->{"id"});
my $dbh = $form->dbconnect($myconfig);
do_query($form, $dbh, qq|UPDATE oe SET closed = TRUE where id = ?|,
# connect to database
my $dbh = $form->dbconnect_noauto($myconfig);
- my ($query, @values, @ids);
+ my ($query, $query_add, @values, @ids, $sth);
# translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
map {
undef @ids;
}
- if ($form->{id}) {
-
- # get default accounts and last order number
- $query = qq|SELECT (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno,
- (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id) AS income_accno,
- (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id) AS expense_accno,
- (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
- (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
- d.curr AS currencies
- FROM defaults d|;
- } else {
- $query = qq|SELECT (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno,
- (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id) AS income_accno,
- (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id) AS expense_accno,
- (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
- (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
- d.curr AS currencies, current_date AS transdate, current_date AS reqdate
- FROM defaults d|;
- }
- my $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- my $ref = $sth->fetchrow_hashref(NAME_lc);
+ $query_add = qq|, current_date AS transdate, current_date AS reqdate| if (!$form->{id});
+
+ # get default accounts
+ $query = qq|SELECT (SELECT c.accno FROM chart c WHERE d.inventory_accno_id = c.id) AS inventory_accno,
+ (SELECT c.accno FROM chart c WHERE d.income_accno_id = c.id) AS income_accno,
+ (SELECT c.accno FROM chart c WHERE d.expense_accno_id = c.id) AS expense_accno,
+ (SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
+ (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
+ d.curr AS currencies
+ $query_add
+ FROM defaults d|;
+ my $ref = selectfirst_hashref_query($form, $dbh, $query);
map { $form->{$_} = $ref->{$_} } keys %$ref;
- $sth->finish;
($form->{currency}) = split(/:/, $form->{currencies});
o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
o.reqdate, o.project_id, o.serialnumber, o.ship, o.lastcost,
o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,
+ o.price_factor_id, o.price_factor, o.marge_price_factor,
pr.projectnumber, p.formel,
pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
FROM orderitems o
$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};
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 = "";
qw(runningnumber number description longdescription qty ship unit bin
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);
my $sameitem = "";
foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
$position++;
}
- push(@{ $form->{runningnumber} }, $i);
- push(@{ $form->{number} }, qq|$form->{"partnumber_$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->{ship} },
- $form->format_amount($myconfig, $form->{"ship_$i"}));
- push(@{ $form->{unit} }, qq|$form->{"unit_$i"}|);
- push(@{ $form->{bin} }, qq|$form->{"bin_$i"}|);
- push(@{ $form->{"partnotes"} }, qq|$form->{"partnotes_$i"}|);
- push(@{ $form->{serialnumber} }, qq|$form->{"serialnumber_$i"}|);
- push(@{ $form->{reqdate} }, qq|$form->{"reqdate_$i"}|);
-
- push(@{ $form->{sellprice} }, $form->{"sellprice_$i"});
-
- 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);
-
- my $discount =
- $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
-
- # keep a netprice as well, (sellprice - discount)
- #$form->{"netprice_$i"} = $sellprice - $discount;
- $form->{"netprice_$i"} = $sellprice - $i_discount;
- my $nodiscount_linetotal =
- $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
- my $linetotal =
- $form->round_amount($form->{"qty_$i"} * $form->{"netprice_$i"}, 2);
-
- push(@{ $form->{netprice} },
- ($form->{"netprice_$i"} != 0)
- ? $form->format_amount(
- $myconfig, $form->{"netprice_$i"},
- $decimalplaces
- )
- : " ");
-
- $discount =
- ($discount != 0)
- ? $form->format_amount($myconfig, $discount * -1, $decimalplaces)
- : " ";
- $linetotal = ($linetotal != 0) ? $linetotal : " ";
-
- push(@{ $form->{discount} }, $discount);
- push(@{ $form->{p_discount} }, $form->{"discount_$i"});
-
- $form->{ordtotal} += $linetotal;
- $discount_subtotal += $linetotal;
+ my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 };
+
+ push @{ $form->{runningnumber} }, $position;
+ push @{ $form->{number} }, $form->{"partnumber_$i"};
+ push @{ $form->{description} }, $form->{"description_$i"};
+ push @{ $form->{longdescription} }, $form->{"longdescription_$i"};
+ push @{ $form->{qty} }, $form->format_amount($myconfig, $form->{"qty_$i"});
+ push @{ $form->{ship} }, $form->format_amount($myconfig, $form->{"ship_$i"});
+ push @{ $form->{unit} }, $form->{"unit_$i"};
+ push @{ $form->{bin} }, $form->{"bin_$i"};
+ push @{ $form->{partnotes} }, $form->{"partnotes_$i"};
+ push @{ $form->{serialnumber} }, $form->{"serialnumber_$i"};
+ push @{ $form->{reqdate} }, $form->{"reqdate_$i"};
+ push @{ $form->{sellprice} }, $form->{"sellprice_$i"};
+ push @{ $form->{listprice} }, $form->{"listprice_$i"};
+ push @{ $form->{price_factor} }, $price_factor->{formatted_factor};
+ push @{ $form->{price_factor_name} }, $price_factor->{description};
+
+ my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+ my ($dec) = ($sellprice =~ /\.(\d+)/);
+ my $decimalplaces = max 2, length($dec);
+
+ my $discount = $form->round_amount($form->{"qty_$i"} * $sellprice * $form->{"discount_$i"} / 100 / $price_factor->{factor}, $decimalplaces);
+ my $linetotal = $form->round_amount($form->{"qty_$i"} * $sellprice * (100 - $form->{"discount_$i"}) / 100 / $price_factor->{factor}, 2);
+ 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) : '';
+
+ $linetotal = ($linetotal != 0) ? $linetotal : '';
+
+ push @{ $form->{discount} }, ($discount != 0) ? $form->format_amount($myconfig, $discount * -1, $decimalplaces) : '';
+ push @{ $form->{p_discount} }, $form->{"discount_$i"};
+
+ $form->{ordtotal} += $linetotal;
$form->{nodiscount_total} += $nodiscount_linetotal;
- $nodiscount_subtotal += $nodiscount_linetotal;
- $form->{discount_total} += $form->parse_amount($myconfig, $discount);
+ $form->{discount_total} += $discount;
+
+ if ($subtotal_header) {
+ $discount_subtotal += $linetotal;
+ $nodiscount_subtotal += $nodiscount_linetotal;
+ }
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->{discount_sub} }, $form->format_amount($myconfig, $discount_subtotal, 2);
+ push @{ $form->{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->{discount_sub} }, "";
+ push @{ $form->{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->{linetotal} }, $form->format_amount($myconfig, $linetotal, 2);
+ push @{ $form->{nodiscount_linetotal} }, $form->format_amount($myconfig, $nodiscount_linetotal, 2);
push(@{ $form->{projectnumber} }, $projectnumbers{$form->{"project_id_$i"}});
$form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
}
- $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);
if($form->{taxincluded}) {
$form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal} - $tax, 2);
- }
- else {
+ } else {
$form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
}
- $form->{ordtotal} =
- ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;
+
+ $form->{ordtotal} = ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;
# format amounts
- $form->{quototal} = $form->{ordtotal} =
- $form->format_amount($myconfig, $form->{ordtotal}, 2);
+ $form->{quototal} = $form->{ordtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
if ($form->{type} =~ /_quotation/) {
$form->set_payment_options($myconfig, $form->{quodate});
projects / kivitendo-erp.git / blobdiff