$form->{trans_type} = 'stock';
$form->{qty} = $form->parse_amount(\%myconfig, $form->{qty});
- if (!$form->{partnumber} && !$form->{description}) {
- delete @{$form}{qw(parts_id partunit)};
+ if (!$form->{partnumber} && !$form->{description} && !$form->{ean}) {
+ delete @{$form}{qw(parts_id partunit ean)};
transfer_warehouse_selection();
- } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description}) {
+ } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description} || $form->{ean}) {
$form->{no_services} = 1;
$form->{no_assemblies} = 0; # assemblies duerfen eingelagert werden (z.B. bei retouren)
my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
- if (scalar @{ $parts } == 1) {
- @{$form}{qw(parts_id partnumber description)} = @{$parts->[0]}{qw(id partnumber description)};
+ if (!scalar @{ $parts }) {
+ new_item(action => "transfer_stock_update_part");
+ } elsif (scalar @{ $parts } == 1) {
+ @{$form}{qw(parts_id partnumber description ean)} = @{$parts->[0]}{qw(id partnumber description ean)};
transfer_stock_get_partunit();
transfer_warehouse_selection();
# --------------------------------------------------------------------
# Transfer: assemblies
-# Dies ist die Auswahlmaske für ein assembly.
+# Dies ist die Auswahlmaske für ein assembly.
# Die ist einfach von transfer_assembly_update_part kopiert und nur um den trans_type (assembly) korrigiert worden
# Es wäre schön, hier nochmal check_assembly_max_create auf, um die max. Fertigungszahl herauszufinden.
# Ich lass das mal als auskommentierte Idee bestehen jb 18.3.09
}
# hier die oben benannte idee
-# my $maxcreate = Common->check_assembly_max_create(assembly_id => $form->{parts_id}, dbh => $my_dbh);
+# my $maxcreate = Common->check_assembly_max_create(assembly_id => $form->{parts_id}, dbh => $my_dbh);
$lxdebug->leave_sub();
}
sub transfer_stock_part_selected {
my $part = shift;
- @{$form}{qw(parts_id partnumber description)} = @{$part}{qw(id partnumber description)};
+ @{$form}{qw(parts_id partnumber description ean)} = @{$part}{qw(id partnumber description ean)};
transfer_stock_get_partunit();
transfer_warehouse_selection();
if ($form->{qty} <= 0) {
$form->show_generic_error($locale->text('Invalid quantity.'), 'back_button' => 1);
}
- # TODO Es wäre schön, hier schon die maximale Anzahl der zu fertigenden Erzeugnisse zu haben
+ # TODO Es wäre schön, hier schon die maximale Anzahl der zu fertigenden Erzeugnisse zu haben
#else { if ($form->{qty} > $maxcreate) { #s.o.
# $form->show_generic_error($locale->text('Can not create that quantity with current stock'), 'back_button' => 1);
# $form->show_generic_error('Maximale Stückzahl' . $maxcreate , 'back_button' => 1);
- # }
+ # }
# }
if (!$form->{warehouse_id} || !$form->{bin_id}) {
# Anm. jb 18.3. vielleicht auch nur meine unwissenheit in perl-datenstrukturen
my %TRANSFER = (
'transfer_type' => 'assembly',
- 'login' => $form->{login},
+ 'login' => $form->{login},
'dst_warehouse_id' => $form->{warehouse_id},
'dst_bin_id' => $form->{bin_id},
'chargenumber' => $form->{chargenumber},
- 'assembly_id' => $form->{parts_id},
+ 'assembly_id' => $form->{parts_id},
'qty' => $form->{qty},
'unit' => $form->{unit},
'comment' => $form->{comment}
$form->{sort} ||= 'date';
my %filter;
- my @columns = qw(trans_id date warehouse_from bin_from warehouse_to bin_to partnumber partdescription chargenumber trans_type comment qty employee projectnumber);
+ my @columns = qw(trans_id date warehouse_from bin_from warehouse_to bin_to partnumber partdescription chargenumber trans_type comment qty employee oe_id projectnumber);
# filter stuff
map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber);
'qty' => { 'text' => $locale->text('Qty'), },
'employee' => { 'text' => $locale->text('Employee'), },
'projectnumber' => { 'text' => $locale->text('Project Number'), },
+ 'oe_id' => { 'text' => $locale->text('Document'), },
);
my $href = build_std_url('action=generate_journal', grep { $form->{$_} } @hidden_variables);
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('generate_journal', @hidden_variables);
+ $report->set_export_options('generate_journal', @hidden_variables, qw(sort order));
$report->set_sort_indicator($form->{sort}, $form->{order});
$report->set_options('output_format' => 'HTML',
'title' => $form->{title},
- 'attachment_basename' => strftime('warehouse_journal_%Y%m%d', localtime time));
+ 'attachment_basename' => strftime($locale->text('warehouse_journal_list') . '_%Y%m%d', localtime time));
$report->set_options_from_form();
my $all_units = AM->retrieve_units(\%myconfig, $form);
my @contents = WH->get_warehouse_journal(%filter);
+ my %doc_types = ( 'sales_quotation' => { script => 'oe', title => $locale->text('Sales quotation') },
+ 'sales_order' => { script => 'oe', title => $locale->text('Sales Order') },
+ 'request_quotation' => { script => 'oe', title => $locale->text('Request quotation') },
+ 'purchase_order' => { script => 'oe', title => $locale->text('Purchase Order') },
+ 'sales_delivery_order' => { script => 'do', title => $locale->text('Sales delivery order') },
+ 'purchase_delivery_order' => { script => 'do', title => $locale->text('Purchase delivery order') },
+ 'sales_invoice' => { script => 'is', title => $locale->text('Sales Invoice') },
+ 'purchase_invoice' => { script => 'ir', title => $locale->text('Purchase Invoice') },
+ );
+
foreach $entry (@contents) {
$entry->{qty} = $form->format_amount_units('amount' => $entry->{qty},
'part_unit' => $entry->{partunit},
'align' => $column_alignment{trans_type},
};
+ if ($form->{l_oe_id}) {
+ $row->{oe_id}->{data} = '';
+ my $info = $entry->{oe_id_info};
+
+ if ($info && $info->{id} && $info->{type} && $doc_types{$info->{type}}) {
+ $row->{oe_id} = { data => $doc_types{ $info->{type} }->{title} . ' ' . $info->{number},
+ link => build_std_url('script=' . $doc_types{ $info->{type} }->{script} . '.pl', 'action=edit', 'id=' . $info->{id}, 'type=' . $info->{type}) };
+ }
+ }
+
$report->add_data($row);
}
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('generate_report', @hidden_variables);
+ $report->set_export_options('generate_report', @hidden_variables, qw(sort order));
$report->set_sort_indicator($sort_col, $form->{order});
$report->set_options('output_format' => 'HTML',
'title' => $form->{title},
- 'attachment_basename' => strftime('warehouse_report_%Y%m%d', localtime time));
+ 'attachment_basename' => strftime($locale->text('warehouse_report_list') . '_%Y%m%d', localtime time));
$report->set_options_from_form();
my $all_units = AM->retrieve_units(\%myconfig, $form);
return -1;
}
+=item new_item
+
+call new item dialogue from warehouse masks.
+
+PARAMS:
+ action => name of sub to be called when new item is done
+
+=cut
+sub new_item {
+ $main::lxdebug->enter_sub();
+ my %params = @_;
+
+ # change callback
+ $form->{old_callback} = $form->escape($form->{callback}, 1);
+ $form->{callback} = $form->escape("$form->{script}?action=$params{action}", 1);
+
+ # save all form variables except action in a previousform variable
+ my $previousform = join '&', map { my $value = $form->{$_}; $value =~ s/&/%26/; "$_=$value" } grep { !/action/ } keys %$form;
+
+# push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+ push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(partnumber description unit vc sellprice ean);
+ push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} };
+ push @HIDDENS, { 'name' => 'notes', 'value' => $form->{longdescription} };
+
+ $form->header();
+ print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
+
+ $main::lxdebug->leave_sub();
+}
+
sub update {
call_sub($form->{update_nextsub} || $form->{nextsub});
}
projects / kivitendo-erp.git / blobdiff