use List::Util qw(max);
use SL::AM;
+use SL::CVar;
use SL::Common;
use SL::DBUtils;
use SL::MoreCommon;
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 = "";
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);
my @tax_arrays =
qw(taxbase tax taxdescription taxrate taxnumber);
$position++;
}
- push @{ $form->{runningnumber} }, $position;
- push @{ $form->{number} }, $form->{"partnumber_$i"};
- push @{ $form->{serialnumber} }, $form->{"serialnumber_$i"};
- push @{ $form->{bin} }, $form->{"bin_$i"};
- push @{ $form->{"partnotes"} }, $form->{"partnotes_$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->{unit} }, $form->{"unit_$i"};
- push @{ $form->{deliverydate_oe} }, $form->{"deliverydate_$i"};
- push @{ $form->{sellprice} }, $form->{"sellprice_$i"};
- push @{ $form->{ordnumber_oe} }, $form->{"ordnumber_$i"};
- push @{ $form->{transdate_oe} }, $form->{"transdate_$i"};
- push @{ $form->{invnumber} }, $form->{"invnumber"};
- push @{ $form->{invdate} }, $form->{"invdate"};
+ my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 };
+
+ push @{ $form->{runningnumber} }, $position;
+ push @{ $form->{number} }, $form->{"partnumber_$i"};
+ push @{ $form->{serialnumber} }, $form->{"serialnumber_$i"};
+ push @{ $form->{bin} }, $form->{"bin_$i"};
+ push @{ $form->{"partnotes"} }, $form->{"partnotes_$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->{unit} }, $form->{"unit_$i"};
+ push @{ $form->{deliverydate_oe} }, $form->{"deliverydate_$i"};
+ push @{ $form->{sellprice} }, $form->{"sellprice_$i"};
+ push @{ $form->{ordnumber_oe} }, $form->{"ordnumber_$i"};
+ push @{ $form->{transdate_oe} }, $form->{"transdate_$i"};
+ push @{ $form->{invnumber} }, $form->{"invnumber"};
+ push @{ $form->{invdate} }, $form->{"invdate"};
+ push @{ $form->{price_factor} }, $price_factor->{formatted_factor};
+ push @{ $form->{price_factor_name} }, $price_factor->{description};
if ($form->{lizenzen}) {
if ($form->{"licensenumber_$i"}) {
my ($dec) = ($sellprice =~ /\.(\d+)/);
my $decimalplaces = max 2, length($dec);
- my $discount = $form->round_amount($form->{"qty_$i"} * $sellprice * $form->{"discount_$i"} / 100, $decimalplaces);
- my $linetotal = $form->round_amount($form->{"qty_$i"} * $sellprice * (100 - $form->{"discount_$i"}) / 100, 2);
- my $nodiscount_linetotal = $form->round_amount($form->{"qty_$i"} * $sellprice, 2);
+ 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) : '';
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();
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;
+
foreach my $i (1 .. $form->{rowcount}) {
if ($form->{type} eq "credit_note") {
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"}) * -1;
my $basqty;
$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;
if ($form->{storno}) {
$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);
}
}
sellprice, fxsellprice, discount, allocated, assemblyitem,
unit, deliverydate, project_id, serialnumber, pricegroup_id,
ordnumber, transdate, cusordnumber, base_qty, subtotal,
- marge_percent, marge_total, lastcost)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+ 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->{"serialnumber_$i"}, conv_i($pricegroup_id),
$form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
$form->{"cusordnumber_$i"}, $baseqty, $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);
if ($form->{lizenzen} && $form->{"licensenumber_$i"}) {
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
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);
# 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");
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});
-
+ if ($ref->{inventory_accno_id}) {
# de-allocated purchases
$query =
qq|SELECT i.id, i.trans_id, i.allocated
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, 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
}
$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};
}
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.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);
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);
}
}
- #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};
}
}
$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}) {
projects / kivitendo-erp.git / blobdiff