package OE;
+use List::Util qw(max);
+
use SL::AM;
use SL::Common;
use SL::DBUtils;
qq| o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
qq| o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
qq| o.transaction_description, | .
+ 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}};
}
do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
}
- my $amount;
- my $linetotal;
- my $discount;
+ my $amount = 0;
+ my $linetotal = 0;
+ my $discount = 0;
my $project_id;
my $reqdate;
my $taxrate;
- my $taxamount;
+ my $taxamount = 0;
my $fxsellprice;
my %taxbase;
my @taxaccounts;
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_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->{"discount_$i"} =
$form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
$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;
# get pricegroup_id and save ist
($null, my $pricegroup_id) = split(/--/, $form->{"sellprice_pg_$i"});
$pricegroup_id *= 1;
- $subtotal = $form->{"subtotal_$i"} * 1;
# save detail record in orderitems table
@values = ();
}
$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|pricegroup_id, ordnumber, transdate, cusordnumber, subtotal, | .
+ 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->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
$form->{"serialnumber_$i"}, $form->{"ship_$i"}, conv_i($pricegroup_id),
$form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
- $form->{"cusordnumber_$i"}, $subtotal);
+ $form->{"cusordnumber_$i"}, $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);
$form->{"sellprice_$i"} = $fxsellprice;
? $exchangerate
: $form->parse_amount($myconfig, $form->{exchangerate});
- my $quotation;
-
- # fill in subject if there is none
- if ($form->{type} =~ /_order$/) {
- $quotation = '0';
- $form->{subject} = qq|$form->{label} $form->{ordnumber}|
- unless $form->{subject};
- } else {
- $quotation = '1';
- $form->{subject} = qq|$form->{label} $form->{quonumber}|
- 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};
+ my $quotation = $form->{type} =~ /_order$/ ? 'f' : 't';
($null, $form->{department_id}) = split(/--/, $form->{department});
# save OE record
$query =
- qq|UPDATE oe set | .
- qq|ordnumber = ?, quonumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?, | .
- qq|customer_id = ?, amount = ?, netamount = ?, reqdate = ?, taxincluded = ?, | .
- qq|shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?, | .
- qq|delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?, | .
- qq|taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?, | .
- qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ? | .
- qq|WHERE id = ?|;
+ qq|UPDATE oe SET
+ ordnumber = ?, quonumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?,
+ customer_id = ?, amount = ?, netamount = ?, reqdate = ?, taxincluded = ?,
+ shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?,
+ delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?,
+ taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?,
+ globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, marge_total = ?, marge_percent = ?
+ WHERE id = ?|;
@values = ($form->{ordnumber}, $form->{quonumber},
$form->{cusordnumber}, conv_date($form->{transdate}),
$amount, $netamount, conv_date($reqdate),
$form->{taxincluded} ? 't' : 'f', $form->{shippingpoint},
$form->{shipvia}, $form->{notes}, $form->{intnotes},
- $form->{currency}, $form->{closed} ? 't' : 'f',
+ substr($form->{currency}, 0, 3), $form->{closed} ? 't' : 'f',
$form->{delivered} ? "t" : "f", $form->{proforma} ? 't' : 'f',
$quotation, conv_i($form->{department_id}),
conv_i($form->{language_id}), conv_i($form->{taxzone_id}),
conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
$form->{transaction_description},
+ $form->{marge_total} * 1, $form->{marge_percent} * 1,
conv_i($form->{id}));
do_query($form, $dbh, $query, @values);
# 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 | .
- qq| WHERE d.inventory_accno_id = c.id) AS inventory_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.income_accno_id = c.id) AS income_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.expense_accno_id = c.id) AS expense_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.fxgain_accno_id = c.id) AS fxgain_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.fxloss_accno_id = c.id) AS fxloss_accno, | .
- qq|d.curr AS currencies | .
- qq|FROM defaults d|;
- } else {
- $query =
- qq|SELECT (SELECT c.accno FROM chart c | .
- qq| WHERE d.inventory_accno_id = c.id) AS inventory_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.income_accno_id = c.id) AS income_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.expense_accno_id = c.id) AS expense_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.fxgain_accno_id = c.id) AS fxgain_accno, | .
- qq| (SELECT c.accno FROM chart c | .
- qq| WHERE d.fxloss_accno_id = c.id) AS fxloss_accno, | .
- qq|d.curr AS currencies, | .
- qq|current_date AS transdate, current_date AS reqdate | .
- qq|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});
# so if any of these infos is important (or even different) for any item,
# it will be killed out and then has to be fetched from the item scope query further down
$query =
- qq|SELECT o.cp_id, o.ordnumber, o.transdate, o.reqdate, | .
- qq| o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes, | .
- qq| o.curr AS currency, e.name AS employee, o.employee_id, o.salesman_id, | .
- qq| o.${vc}_id, cv.name AS ${vc}, o.amount AS invtotal, | .
- qq| o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber, | .
- qq| d.description AS department, o.payment_id, o.language_id, o.taxzone_id, | .
- qq| o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, | .
- qq| o.globalproject_id, o.delivered, o.transaction_description | .
- qq|FROM oe o | .
- qq|JOIN ${vc} cv ON (o.${vc}_id = cv.id) | .
- qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
- qq|LEFT JOIN department d ON (o.department_id = d.id) | .
- ($form->{id} ? qq|WHERE o.id = ?| :
- qq|WHERE o.id IN (| . join(', ', map("? ", @ids)) . qq|)|);
+ qq|SELECT o.cp_id, o.ordnumber, o.transdate, o.reqdate,
+ o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes,
+ o.curr AS currency, e.name AS employee, o.employee_id, o.salesman_id,
+ o.${vc}_id, cv.name AS ${vc}, o.amount AS invtotal,
+ o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
+ d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
+ o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,
+ o.globalproject_id, o.delivered, o.transaction_description
+ FROM oe o
+ JOIN ${vc} cv ON (o.${vc}_id = cv.id)
+ LEFT JOIN employee e ON (o.employee_id = e.id)
+ LEFT JOIN department d ON (o.department_id = d.id) | .
+ ($form->{id}
+ ? "WHERE o.id = ?"
+ : "WHERE o.id IN (" . join(', ', map("? ", @ids)) . ")"
+ );
@values = $form->{id} ? ($form->{id}) : @ids;
$sth = prepare_execute_query($form, $dbh, $query, @values);
if ($form->{delivery_customer_id}) {
$query = qq|SELECT name FROM customer WHERE id = ?|;
- ($form->{delivery_customer_string}) =
- selectrow_query($form, $dbh, $query, $form->{delivery_customer_id});
+ ($form->{delivery_customer_string}) = selectrow_query($form, $dbh, $query, $form->{delivery_customer_id});
}
if ($form->{delivery_vendor_id}) {
$query = qq|SELECT name FROM customer WHERE id = ?|;
- ($form->{delivery_vendor_string}) =
- selectrow_query($form, $dbh, $query, $form->{delivery_vendor_id});
+ ($form->{delivery_vendor_string}) = selectrow_query($form, $dbh, $query, $form->{delivery_vendor_id});
}
# shipto and pinted/mailed/queued status makes only sense for single id retrieve
if (!@ids) {
- $query = qq|SELECT s.* FROM shipto s | .
- qq|WHERE s.trans_id = ? AND s.module = 'OE'|;
+ $query = qq|SELECT s.* FROM shipto s WHERE s.trans_id = ? AND s.module = 'OE'|;
$sth = prepare_execute_query($form, $dbh, $query, $form->{id});
$ref = $sth->fetchrow_hashref(NAME_lc);
$sth->finish;
# get printed, emailed and queued
- $query = qq|SELECT s.printed, s.emailed, s.spoolfile, s.formname | .
- qq|FROM status s | .
- qq|WHERE s.trans_id = ?|;
+ $query = qq|SELECT s.printed, s.emailed, s.spoolfile, s.formname FROM status s WHERE s.trans_id = ?|;
$sth = prepare_execute_query($form, $dbh, $query, $form->{id});
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 %oid = ('Pg' => 'oid',
'Oracle' => 'rowid');
- my $transdate =
- $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
+ my $transdate = $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
$form->{taxzone_id} = 0 unless ($form->{taxzone_id});
# this query looks up all information about the items
# stuff different from the whole will not be overwritten, but saved with a suffix.
$query =
- qq|SELECT o.id AS orderitems_id, | .
- qq| c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid, | .
- qq| c2.accno AS income_accno, c2.new_chart_id AS income_new_chart, date($transdate) - c2.valid_from as income_valid, | .
- qq| c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from as expense_valid, | .
- qq| oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe, | .
- qq| p.partnumber, p.assembly, o.description, o.qty, | .
- qq| 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, | .
- qq| o.reqdate, o.project_id, o.serialnumber, o.ship, | .
- qq| o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription, | .
- qq| pr.projectnumber, p.formel, | .
- qq| pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup | .
- qq|FROM orderitems o | .
- qq|JOIN parts p ON (o.parts_id = p.id) | .
- qq|JOIN oe ON (o.trans_id = oe.id) | .
- qq|LEFT JOIN chart c1 ON ((SELECT inventory_accno_id FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c1.id) | .
- qq|LEFT JOIN chart c2 ON ((SELECT income_accno_id_$form->{taxzone_id} FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c2.id) | .
- qq|LEFT JOIN chart c3 ON ((SELECT expense_accno_id_$form->{taxzone_id} FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c3.id) | .
- qq|LEFT JOIN project pr ON (o.project_id = pr.id) | .
- qq|LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) | .
- ($form->{id} ? qq|WHERE o.trans_id = ?| :
- qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
+ qq|SELECT o.id AS orderitems_id,
+ 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,
+ oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe,
+ p.partnumber, p.assembly, o.description, o.qty,
+ 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
+ JOIN parts p ON (o.parts_id = p.id)
+ JOIN oe ON (o.trans_id = oe.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_$form->{taxzone_id} FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c2.id)
+ LEFT JOIN chart c3 ON ((SELECT expense_accno_id_$form->{taxzone_id} FROM buchungsgruppen WHERE id=p.buchungsgruppen_id) = c3.id)
+ LEFT JOIN project pr ON (o.project_id = pr.id)
+ LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) | .
+ ($form->{id}
+ ? qq|WHERE o.trans_id = ?|
+ : qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
qq|ORDER BY o.$oid{$myconfig->{dbdriver}}|;
@ids = $form->{id} ? ($form->{id}) : @ids;
delete $ref->{orderitems_id} if (@ids);
# get tax rates and description
- $accno_id =
- ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+ $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
$query =
qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber | .
qq|FROM tax t LEFT JOIN chart c on (c.id = t.chart_id) | .
$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};
}
- $form->{exchangerate} =
- $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},
- ($form->{vc} eq 'customer') ? "buy" : "sell");
+ $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate}, ($form->{vc} eq 'customer') ? "buy" : "sell");
Common::webdav_folder($form) if ($main::webdav);
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