my $sortorder = join ', ',
("o.id", $form->sort_columns(transdate, $ordnumber, name));
- $sortorder = $form->{sort} unless $sortorder;
+ $sortorder = $form->{sort} if $form->{sort};
$query .= " AND lower($ordnumber) LIKE '$number'" if $form->{$ordnumber};
$query .= " AND o.transdate >= '$form->{transdatefrom}'"
$query = qq|INSERT INTO orderitems (|;
$query .= "id, " if $form->{"orderitems_id_$i"};
$query .= qq|trans_id, parts_id, description, qty, sellprice, discount,
- unit, reqdate, project_id, serialnumber, ship, pricegroup_id)
+ unit, reqdate, project_id, serialnumber, ship, pricegroup_id,
+ ordnumber, transdate, cusordnumber)
VALUES (|;
$query .= qq|$form->{"orderitems_id_$i"},|
if $form->{"orderitems_id_$i"};
'$form->{"description_$i"}', $form->{"qty_$i"},
$fxsellprice, $form->{"discount_$i"},
'$form->{"unit_$i"}', $reqdate, (SELECT id from project where projectnumber = '$project_id'),
- '$form->{"serialnumber_$i"}', $form->{"ship_$i"},
- '$pricegroup_id')|;
+ '$form->{"serialnumber_$i"}', $form->{"ship_$i"}, '$pricegroup_id',
+ '$form->{"ordnumber_$i"}', '$form->{"transdate_$i"}', '$form->{"cusordnumber_$i"}')|;
$dbh->do($query) || $form->dberror($query);
$form->{"sellprice_$i"} = $fxsellprice;
if ($form->{"qty_$i"}) {
- map { $form->{"${_}_$i"} =~ s/\'/\'\'/g }
- qw(partnumber description unit);
-
# set values to 0 if nothing entered
$form->{"discount_$i"} =
- $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
+ $form->parse_amount($myconfig, $form->{"discount_$i"});
$form->{"sellprice_$i"} =
$form->parse_amount($myconfig, $form->{"sellprice_$i"});
- $fxsellprice = $form->{"sellprice_$i"};
-
- my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
- $dec = length $dec;
- my $decimalplaces = ($dec > 2) ? $dec : 2;
-
- $discount =
- $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"},
- $decimalplaces);
- $form->{"sellprice_$i"} =
- $form->round_amount($form->{"sellprice_$i"} - $discount,
- $decimalplaces);
-
- $form->{"inventory_accno_$i"} *= 1;
- $form->{"expense_accno_$i"} *= 1;
}
}
# get ids from $form
# connect to database
my $dbh = $form->dbconnect_noauto($myconfig);
- my $query;
+ my $query, @ids;
# translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
- map { push @ids, $form->{"trans_id_$_"} if ($form->{"id_$_"}) } (1 .. $form->{"rowcount"});
+ map { push @ids, $form->{"trans_id_$_"} if ($form->{"id_$_"} and $form->{"trans_id_$_"}) } (1 .. $form->{"rowcount"});
# if called in multi id mode, and still only got one id, switch back to single id
if ($form->{"rowcount"} and $#ids == 0) {
($form->{currency}) = split /:/, $form->{currencies};
+ # set reqdate if this is an invoice->order conversion. If someone knows a better check to ensure
+ # we come from invoices, feel free.
+ $form->{reqdate} = $form->{deliverydate} if ($form->{deliverydate} and $form->{callback} =~ /action=ar_transactions/);
+
if ($form->{id} or @ids) {
# retrieve order for single id
$ref = $sth->fetchrow_hashref(NAME_lc);
map { $form->{$_} = $ref->{$_} } keys %$ref;
- # destroy all entries for multiple ids that yield different information
+ # set all entries for multiple ids blank that yield different information
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
- map { undef $form->{$_} if ($ref->{$_} ne $form->{$_}) } keys %$ref;
+ map { $form->{$_} = '' if ($ref->{$_} ne $form->{$_}) } keys %$ref;
}
# if not given, fill transdate with current_date
c1.accno AS inventory_accno,
c2.accno AS income_accno,
c3.accno AS expense_accno,
- oe.ordnumber, oe.transdate, oe.cusordnumber,
+ 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,
o.reqdate, o.project_id, o.serialnumber, o.ship,
+ o.ordnumber, o.transdate, o.cusordnumber,
pr.projectnumber,
pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
FROM orderitems o
$sth->execute || $form->dberror($query);
while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+
+ # in collective order, copy global ordnumber, transdate, cusordnumber into item scope
+ # unless already present there
+ # remove _oe entries afterwards
+ map { $ref->{$_} = $ref->{"${_}_oe"} if ($ref->{$_} eq '') }
+ qw|ordnumber transdate cusordnumber| if (@ids);
+ map{ delete $ref->{$_} }
+ qw|ordnumber_oe transdate_oe cusordnumber_oe|;
#set expense_accno=inventory_accno if they are different => bilanz
$vendor_accno =
$dec = length $dec;
my $decimalplaces = ($dec > 2) ? $dec : 2;
- my $discount =
- $form->round_amount(
- $sellprice * $form->parse_amount($myconfig,
- $form->{"discount_$i"}) / 100,
- $decimalplaces);
+ 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 - $discount;
+ $form->{"netprice_$i"} = $sellprice - $i_discount;
my $linetotal =
$form->round_amount($form->{"qty_$i"} * $form->{"netprice_$i"}, 2);
$linetotal = ($linetotal != 0) ? $linetotal : " ";
push(@{ $form->{discount} }, $discount);
+ push(@{ $form->{p_discount} }, $form->{"discount_$i"});
$form->{ordtotal} += $linetotal;
projects / mfinanz.git / blobdiff