for my $i (1 .. $form->{rowcount}) {
next unless $form->{"id_$i"};
+ my $position = $i;
+
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
$form->{"qty_$i"} *= -1 if $form->{storno};
next if $payments_only;
+ CVar->get_non_editable_ic_cvars(form => $form,
+ dbh => $dbh,
+ row => $i,
+ sub_module => 'invoice',
+ may_converted_from => ['delivery_order_items', 'orderitems', 'invoice']);
+
if (!$form->{"invoice_id_$i"}) {
# there is no persistent id, therefore create one with all necessary constraints
my $q_invoice_id = qq|SELECT nextval('invoiceid')|;
my $h_invoice_id = prepare_query($form, $dbh, $q_invoice_id);
do_statement($form, $h_invoice_id, $q_invoice_id);
$form->{"invoice_id_$i"} = $h_invoice_id->fetchrow_array();
- my $q_create_invoice_id = qq|INSERT INTO invoice (id, trans_id, parts_id) values (?, ?, ?)|;
- do_query($form, $dbh, $q_create_invoice_id, conv_i($form->{"invoice_id_$i"}), conv_i($form->{id}), conv_i($form->{"id_$i"}));
+ my $q_create_invoice_id = qq|INSERT INTO invoice (id, trans_id, position, parts_id) values (?, ?, ?, ?)|;
+ do_query($form, $dbh, $q_create_invoice_id, conv_i($form->{"invoice_id_$i"}),
+ conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}));
$h_invoice_id->finish();
}
# save detail record in invoice table
$query = <<SQL;
- UPDATE invoice SET trans_id = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
+ UPDATE invoice SET trans_id = ?, position = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
sellprice = ?, fxsellprice = ?, discount = ?, allocated = ?, unit = ?, deliverydate = ?,
project_id = ?, serialnumber = ?, price_factor_id = ?,
price_factor = (SELECT factor FROM price_factors WHERE id = ?), marge_price_factor = ?,
WHERE id = ?
SQL
- @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}),
+ @values = (conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}),
$form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"} * -1,
$baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated,
$form->{"unit_$i"}, conv_date($form->{deliverydate}),
name_prefix => 'ic_',
name_postfix => "_$i",
dbh => $dbh);
+
# link previous items with invoice items See IS.pm (no credit note -> no invoice item)
foreach (qw(delivery_order_items orderitems)) {
- if ($form->{"converted_from_${_}_id_$i"}) {
+ if (!$form->{useasnew} && $form->{"converted_from_${_}_id_$i"}) {
RecordLinks->create_links('dbh' => $dbh,
'mode' => 'ids',
'from_table' => $_,
'to_table' => 'invoice',
'to_id' => $form->{"invoice_id_$i"},
);
- delete $form->{"converted_from_${_}_id_$i"};
}
+ delete $form->{"converted_from_${_}_id_$i"};
}
}
if ($payments_only) {
$query = qq|UPDATE ap SET paid = ? WHERE id = ?|;
do_query($form, $dbh, $query, $form->{paid}, conv_i($form->{id}));
-
+ $form->new_lastmtime('ap');
if (!$provided_dbh) {
$dbh->commit();
$dbh->disconnect();
$form->{invnumber}, $form->{ordnumber}, $form->{quonumber}, conv_date($form->{invdate}),
conv_date($form->{orddate}), conv_date($form->{quodate}), conv_i($form->{vendor_id}), $amount,
$netamount, $form->{paid}, conv_date($form->{duedate}),
- '1', $taxzone_id, $form->{notes}, $form->{taxincluded} ? 't' : 'f',
+ '1', $taxzone_id, $restricter->process($form->{notes}), $form->{taxincluded} ? 't' : 'f',
$form->{intnotes}, conv_i($form->{storno_id}), $form->{storno} ? 't' : 'f',
conv_i($form->{cp_id}), conv_i($form->{employee_id}), conv_i($form->{department_id}), conv_i($form->{delivery_term_id}),
conv_i($form->{globalproject_id}),
do_query($form, $dbh, $query, conv_i($form->{id}));
}
+ $form->new_lastmtime('ap');
$form->{name} = $form->{vendor};
$form->{name} =~ s/--\Q$form->{vendor_id}\E//;
# safety check datev export
if ($::instance_conf->get_datev_check_on_purchase_invoice) {
+ # if we need department for kostenstelle in DATEV check
+ $form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
my $transdate = $::form->{invdate} ? DateTime->from_lxoffice($::form->{invdate}) : undef;
$transdate ||= DateTime->today;
exporttype => DATEV_ET_BUCHUNGEN,
format => DATEV_FORMAT_KNE,
dbh => $dbh,
- from => $transdate,
- to => $transdate,
trans_id => $form->{id},
);
#adjust allocated
$form->update_balance($dbh, "invoice", "allocated", qq|id = $pthref->{id}|, $qty);
- $form->update_balance($dbh, "acc_trans", "amount",
- qq| (trans_id = $pthref->{trans_id})
- AND (chart_id = $ref->{expense_accno_id})
- AND (transdate = '$pthref->{transdate}')|,
- $amount);
+ if ( $::instance_conf->get_inventory_system eq 'perpetual' ) {
- $form->update_balance($dbh, "acc_trans", "amount",
- qq| (trans_id = $pthref->{trans_id})
- AND (chart_id = $ref->{inventory_accno_id})
- AND (transdate = '$pthref->{transdate}')|,
- $amount * -1);
+ $form->update_balance($dbh, "acc_trans", "amount",
+ qq| (trans_id = $pthref->{trans_id})
+ AND (chart_id = $ref->{expense_accno_id})
+ AND (transdate = '$pthref->{transdate}')|,
+ $amount);
+
+ $form->update_balance($dbh, "acc_trans", "amount",
+ qq| (trans_id = $pthref->{trans_id})
+ AND (chart_id = $ref->{inventory_accno_id})
+ AND (transdate = '$pthref->{transdate}')|,
+ $amount * -1);
+ }
last if (($ref->{allocated} -= $qty) <= 0);
}
$query = qq|SELECT cp_id, invnumber, transdate AS invdate, duedate,
orddate, quodate, globalproject_id,
ordnumber, quonumber, paid, taxincluded, notes, taxzone_id, storno, gldate,
+ mtime, itime,
intnotes, (SELECT cu.name FROM currencies cu WHERE cu.id=ap.currency_id) AS currency, direct_debit,
delivery_term_id
FROM ap
WHERE id = ?|;
$ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
map { $form->{$_} = $ref->{$_} } keys %$ref;
+ $form->{mtime} = $form->{itime} if !$form->{mtime};
+ $form->{lastmtime} = $form->{mtime};
$form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
WHERE i.trans_id = ?
- ORDER BY i.id|;
+ ORDER BY i.position|;
$sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
my $query =
qq|SELECT
v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount,
- v.creditlimit, v.terms, v.notes AS intnotes,
+ v.creditlimit, v.notes AS intnotes,
v.email, v.cc, v.bcc, v.language_id, v.payment_id, v.delivery_term_id,
v.street, v.zipcode, v.city, v.country, v.taxzone_id, cu.name AS curr, v.direct_debit,
$duedate + COALESCE(pt.terms_netto, 0) AS duedate,
- b.description AS business
+ b.discount AS tradediscount, b.description AS business
FROM vendor v
LEFT JOIN business b ON (b.id = v.business_id)
LEFT JOIN payment_terms pt ON (v.payment_id = pt.id)
my $field = (split m{\.}, $table_column)[1];
next unless $form->{"${field}_${i}"};
$where .= " AND lower(${table_column}) LIKE lower(?)";
- push @values, '%' . $form->{"${field}_${i}"} . '%';
+ push @values, like($form->{"${field}_${i}"});
}
my (%mm_by_id);
LEFT JOIN parts ON parts.id = parts_id
WHERE NOT parts.obsolete AND model ILIKE ? AND (make IS NULL OR make = ?);
|;
- my $mm_results = selectall_hashref_query($::form, $dbh, $mm_query, '%' . $form->{"partnumber_$i"} . '%', $::form->{vendor_id});
+ my $mm_results = selectall_hashref_query($::form, $dbh, $mm_query, like($form->{"partnumber_$i"}), $::form->{vendor_id});
my @mm_ids = map { $_->{parts_id} } @$mm_results;
push @{$mm_by_id{ $_->{parts_id} } ||= []}, $_ for @$mm_results;
push @{ $ref->{matches} ||= [] }, $::locale->text('Model') . ': ' . join ', ', map { $_->{model} } @{ $mm_by_id{$ref->{id}} };
}
- if ($ref->{ean} eq $::form->{"partnumber_$i"}) {
+ if (($::form->{"partnumber_$i"} ne '') && ($ref->{ean} eq $::form->{"partnumber_$i"})) {
push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
}
return $duedate;
}
-
1;