Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f5abed86

Von Kivitendo Admin vor mehr als 8 Jahren hinzugefügt

  • ID f5abed8644dc069876b3e1cca970cb842fd50ffa
  • Vorgänger 98b64fe1
  • Nachfolger 862bc8ce

$form->{item} nach $form->{part_type} umbenannt

Damit das Feld automatisch dem Datenbanknamen entspricht.

Unterschiede anzeigen:

SL/IC.pm
$form->{lastmtime} = $form->{mtime};
$form->{onhand} *= 1;
die "part needs a part_type" unless $form->{part_type}; # TODO from part_type enum conversion
# part or service item
$form->{item} = $form->{part_type};
if ($form->{item} eq 'assembly') {
if ($form->{part_type} eq 'assembly') {
# retrieve assembly items
$query =
......
my $priceupdate = ', priceupdate = current_date';
if ($form->{id}) {
my $trans_number = SL::TransNumber->new(type => $form->{item}, dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
my $trans_number = SL::TransNumber->new(type => $form->{part_type}, dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
if (!$trans_number->is_unique) {
$::lxdebug->leave_sub;
return 3;
......
# delete makemodel records
do_query($form, $dbh, qq|DELETE FROM makemodel WHERE parts_id = ?|, conv_i($form->{id}));
if ($form->{item} eq 'assembly') {
if ($form->{part_type} eq 'assembly') {
# delete assembly records
do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));
}
......
$priceupdate = '' if (all { $previous_values->{$_} == $form->{$_} } qw(sellprice lastcost listprice));
} else {
my $trans_number = SL::TransNumber->new(type => $form->{item}, dbh => $dbh, number => $form->{partnumber}, save => 1);
my $trans_number = SL::TransNumber->new(type => $form->{part_type}, dbh => $dbh, number => $form->{partnumber}, save => 1);
if ($form->{partnumber} && !$trans_number->is_unique) {
$::lxdebug->leave_sub;
......
$form->{partnumber} ||= $trans_number->create_unique;
($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|);
do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber, unit, part_type) VALUES (?, ?, ?, ?)|, $form->{id}, $form->{partnumber}, $form->{unit}, $form->{item});
do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber, unit, part_type) VALUES (?, ?, ?, ?)|, $form->{id}, $form->{partnumber}, $form->{unit}, $form->{part_type});
$form->{orphaned} = 1;
}
......
}
my ($subq_inventory, $subq_expense, $subq_income);
if ($form->{"item"} eq "part") {
if ($form->{part_type} eq "part") {
$subq_inventory =
qq|(SELECT bg.inventory_accno_id
FROM buchungsgruppen bg
......
$subq_inventory = "NULL";
}
if ($form->{"item"} ne "assembly") {
if ($form->{part_type} ne "assembly") {
$subq_expense =
qq|(SELECT tc.expense_accno_id
FROM taxzone_charts tc
......
$form->{has_sernumber} ? 't' : 'f',
$form->{not_discountable} ? 't' : 'f',
$form->{microfiche},
$form->{item},
$form->{part_type},
conv_i($partsgroup_id),
conv_i($form->{price_factor_id}),
conv_i($form->{id})
......
}
# add assembly records
if ($form->{item} eq 'assembly') {
if ($form->{part_type} eq 'assembly') {
# check additional assembly row
my $i = $form->{assembly_rows};
# if last row is not empty add them

Auch abrufbar als: Unified diff