Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4d5dcceb

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID 4d5dcceb32e4e022287f456f00666f44566e4a07
  • Vorgänger 58c46216
  • Nachfolger 1edd8271

DB::DeliveryOrder: FIX: record_type

Unterschiede anzeigen:

SL/Controller/DeliveryOrder.pm
$order = SL::DB::DeliveryOrder->new(
orderitems => [],
currency_id => $::instance_conf->get_currency_id(),
order_type => $self->type_data->validate
record_type => $self->type_data->validate
);
}
SL/Controller/ImageUpload.pm
sales_order => [ "SL::DB::Order", [ sales => 1, quotation => 0 ] ],
sales_quotation => [ "SL::DB::Order", [ sales => 1, quotation => 1 ] ],
purchase_order => [ "SL::DB::Order", [ sales => 0, quotation => 1 ] ],
sales_delivery_order => [ "SL::DB::DeliveryOrder", [ order_type => 'sales_delivery_order' ] ],
sales_delivery_order => [ "SL::DB::DeliveryOrder", [ record_type => 'sales_delivery_order' ] ],
);
SL/DO.pm
dord.transaction_description, dord.itime::DATE AS insertdate,
pr.projectnumber AS globalprojectnumber,
dep.description AS department,
dord.order_type,
dord.record_type,
e.name AS employee,
sm.name AS salesman
FROM delivery_orders dord
......
|;
if ($form->{type} && is_valid_type($form->{type})) {
push @where, 'dord.order_type = ?';
push @where, 'dord.record_type = ?';
push @values, $form->{type};
}
......
$query = qq|SELECT nextval('id')|;
($form->{id}) = selectrow_query($form, $dbh, $query);
$query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, order_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|;
$query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, record_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|;
do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}), $form->{taxzone_id}, SALES_DELIVERY_ORDER_TYPE);
}
......
shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
delivered = ?, department_id = ?, language_id = ?, shipto_id = ?, billing_address_id = ?,
globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
order_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
record_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
delivery_term_id = ?
WHERE id = ?|;
SL/Presenter/DeliveryOrder.pm
=head1 SYNOPSIS
# Sales delivery orders:
my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ order_type => SALES_DELIVERY_ORDER_TYPE ]);
my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ record_type => SALES_DELIVERY_ORDER_TYPE ]);
my $html = SL::Presenter::DeliveryOrder::sales_delivery_order($object, display => 'inline');
# Purchase delivery orders:
my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ order_type => PURCHASE_DELIVERY_ORDER_TYPE ]);
my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ record_type => PURCHASE_DELIVERY_ORDER_TYPE ]);
my $html = SL::Presenter::DeliveryOrder::purchase_delivery_order($object, display => 'inline');
=head1 FUNCTIONS
SL/TransNumber.pm
$filters{trans_number} = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'nr_key');
$filters{numberfield} = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'transnumber');
$filters{table} = "delivery_orders";
$filters{where} = "order_type = ?";
$filters{where} = "record_type = ?";
$filters{values} = [ $::form->{type} ];
} elsif ($type =~ /_order$/) {
SL/WH.pm
if ($form->{l_oe_id}) {
$q_oe_id = <<SQL;
SELECT dord.id AS id, dord.donumber AS number,
dord.order_type AS type
dord.record_type AS type
FROM delivery_orders dord
WHERE dord.id = ?
bin/mozilla/do.pl
'align' => 'center',
};
$row->{donumber}->{link} = SL::DB::DeliveryOrder::TypeData::get3($dord->{order_type}, "show_menu", "new_controller")
? SL::Controller::DeliveryOrder->url_for(action => "edit", id => $dord->{id}, type => $dord->{order_type})
$row->{donumber}->{link} = SL::DB::DeliveryOrder::TypeData::get3($dord->{record_type}, "show_menu", "new_controller")
? SL::Controller::DeliveryOrder->url_for(action => "edit", id => $dord->{id}, type => $dord->{record_type})
: $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}";
$row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}" if $dord->{oe_id};
bin/mozilla/io.pl
$obj->items(@items) if @items;
if ($class eq 'SL::DB::DeliveryOrder' && !$obj->order_type) {
$obj->order_type(SL::DB::DeliveryOrder::TypeData::validate_type($::form->{type}));
if ($class eq 'SL::DB::DeliveryOrder' && !$obj->record_type) {
$obj->record_type(SL::DB::DeliveryOrder::TypeData::validate_type($::form->{type}));
}
if ($class eq 'SL::DB::Invoice') {

Auch abrufbar als: Unified diff