Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 32823bf0

Von Sven Schöling vor etwa 3 Jahren hinzugefügt

  • ID 32823bf0e854a96c22b17d83bf417e154a87fe14
  • Vorgänger b9e37152
  • Nachfolger 49d361ce

Lieferschein: Suche angepasst auf neue Typen

Unterschiede anzeigen:

SL/DB/DeliveryOrder/TypeData.pm
save_and_ap_transaction => 0,
save_and_invoice => 0,
delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
new_controller => 0,
},
properties => {
customervendor => "customer",
......
save_and_ap_transaction => 0,
save_and_invoice => 0,
delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
new_controller => 0,
},
properties => {
customervendor => "vendor",
......
save_and_ap_transaction => 0,
save_and_invoice => 0,
delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
new_controller => 1,
},
properties => {
customervendor => "vendor",
......
save_and_ap_transaction => 0,
save_and_invoice => 0,
delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
new_controller => 1,
},
properties => {
customervendor => "customer",
SL/DO.pm
use SL::Common;
use SL::CVar;
use SL::DB::DeliveryOrder;
use SL::DB::DeliveryOrder::TypeData qw(:types is_valid_type);
use SL::DB::Status;
use SL::DBUtils;
use SL::Helper::ShippedQty;
......
dord.transaction_description, dord.itime::DATE AS insertdate,
pr.projectnumber AS globalprojectnumber,
dep.description AS department,
dord.order_type,
e.name AS employee,
sm.name AS salesman
FROM delivery_orders dord
......
LEFT JOIN department dep ON (dord.department_id = dep.id)
|;
push @where, ($form->{type} eq 'sales_delivery_order' ? '' : 'NOT ') . qq|COALESCE(dord.is_sales, FALSE)|;
if ($form->{type} && is_valid_type($form->{type})) {
push @where, 'dord.order_type = ?';
push @values, $form->{type};
}
if ($form->{department_id}) {
push @where, qq|dord.department_id = ?|;
......
shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
delivered = ?, department_id = ?, language_id = ?, shipto_id = ?,
globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
is_sales = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
order_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
delivery_term_id = ?
WHERE id = ?|;
......
conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
$form->{transaction_description},
$form->{type} =~ /^sales/ ? 't' : 'f',
$form->{type} =~ /^sales/ ? SALES_DELIVERY_ORDER_TYPE : PURCHASE_DELIVERY_ORDER_TYPE,
conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{payment_id}), $form->{currency},
conv_i($form->{delivery_term_id}),
conv_i($form->{id}));
bin/mozilla/do.pl
use List::Util qw(max sum);
use POSIX qw(strftime);
use SL::Controller::DeliveryOrder;
use SL::DB::DeliveryOrder;
use SL::DB::DeliveryOrder::TypeData qw(:types validate_type);
use SL::DO;
use SL::IR;
use SL::IS;
......
# end of main
sub check_do_access {
$main::auth->assert($main::form->{type} . '_edit');
validate_type($::form->{type});
my $right = SL::DB::DeliveryOrder::TypeData::get($::form->{type}, "right");
$main::auth->assert($right);
}
sub set_headings {
......
'align' => 'center',
};
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}";
$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})
: $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};
$report->add_data($row);
menus/user/00-erp.yaml
params:
action: search
type: purchase_delivery_order
- parent: ap_reports
id: ap_reports_delivery_orders
name: Supplier Delivery Orders
order: 350
access: purchase_delivery_order_edit
module: do.pl
params:
action: search
type: supplier_delivery_order
- parent: ap_reports
id: ap_reports_vendor_invoices_ap_transactions
name: Vendor Invoices & AP Transactions

Auch abrufbar als: Unified diff