my $editing = $form->{id};
- DO->retrieve();
+ DO->retrieve('vc' => $form->{vc},
+ 'ids' => $form->{id});
$payment_id = $form->{payment_id} if ($form->{payment_id});
$language_id = $form->{language_id} if ($form->{language_id});
check_do_access();
- $form->{vc} = $form->{type} eq 'purchase_order' ? 'vendor' : 'customer';
+ $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer';
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
"all" => 1 },
$form->{rowcount} = scalar @{ $form->{DO} };
my @columns = qw(
- transdate
+ ids transdate
id donumber
ordnumber
name employee
$form->{"l_type"} = "Y";
map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
- $column_defs{ids}->{visible} = $allow_multiple_orders ? 'HTML' : 0;
+
+ $column_defs{ids}->{visible} = 'HTML';
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
push @options, $locale->text('Not delivered');
}
- $report->set_options('top_info_text' => join("\n", @options),
- 'output_format' => 'HTML',
- 'title' => $form->{title},
- 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'raw_top_info_text' => $form->parse_html_template('do/orders_top'),
+ 'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom'),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
);
$report->set_options_from_form();
my $edit_url = build_std_url('action=edit', 'type', 'vc');
my $edit_order_url = build_std_url('script=oe.pl', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'), 'action=edit');
+ my $idx = 1;
+
foreach $dord (@{ $form->{DO} }) {
$dord->{open} = $dord->{closed} ? $locale->text('No') : $locale->text('Yes');
$dord->{delivered} = $dord->{delivered} ? $locale->text('Yes') : $locale->text('No');
my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns };
+ $row->{ids} = {
+ 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $dord->{id})
+ . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''),
+ 'valign' => 'center',
+ 'align' => 'center',
+ };
+
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}";
$row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}";
$report->add_data($row);
+
+ $idx++;
}
$report->generate_with_headers();
$lxdebug->enter_sub();
check_do_access();
- $auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit');
+ $auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');
$form->{deliverydate} = $form->{transdate};
$form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
$lxdebug->leave_sub();
}
+sub invoice_multi {
+ $lxdebug->enter_sub();
+
+ check_do_access();
+ $auth->assert($form->{type} eq 'sales_delivery_order' ? 'invoice_edit' : 'vendor_invoice_edit');
+
+ my @do_ids = map { $form->{"trans_id_$_"} } grep { $form->{"multi_id_$_"} } (1..$form->{rowcount});
+
+ if (!scalar @do_ids) {
+ $form->show_generic_error($locale->text('You have not selected any delivery order.'), 'back_button' => 1);
+ }
+
+ map { delete $form->{$_} } grep { m/^(?:trans|multi)_id_\d+/ } keys %{ $form };
+
+ if (!DO->retrieve('vc' => $form->{vc}, 'ids' => \@do_ids)) {
+ $form->show_generic_error($form->{vc} eq 'customer' ?
+ $locale->text('You cannot create an invoice for delivery orders for different customers.') :
+ $locale->text('You cannot create an invoice for delivery orders from different vendors.'),
+ 'back_button' => 1);
+ }
+
+ $form->{deliverydate} = $form->{transdate};
+ $form->{transdate} = $form->current_date(\%myconfig);
+ $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+ $form->{type} = "invoice";
+ $form->{closed} = 0;
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+ my $buysell;
+ if ($form->{type} eq 'purchase_delivery_order') {
+ $form->{title} = $locale->text('Add Vendor Invoice');
+ $form->{script} = 'ir.pl';
+ $script = "ir";
+ $buysell = 'sell';
+
+ } else {
+ $form->{title} = $locale->text('Add Sales Invoice');
+ $form->{script} = 'is.pl';
+ $script = "is";
+ $buysell = 'buy';
+ }
+
+ map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued);
+
+ $form->{rowcount} = 0;
+ foreach my $ref (@{ $form->{form_details} }) {
+ $form->{rowcount}++;
+ map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
+ map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost);
+ }
+ delete $form->{form_details};
+
+ $locale = new Locale "$myconfig{countrycode}", "$script";
+
+ require "bin/mozilla/$form->{script}";
+
+ invoice_links();
+ prepare_invoice();
+ display_form();
+
+ $lxdebug->leave_sub();
+}
+
sub save_as_new {
$lxdebug->enter_sub();
$form->{saveasnew} = 1;
$form->{closed} = 0;
+ $form->{delivered} = 0;
map { delete $form->{$_} } qw(printed emailed queued);
# Let Lx-Office assign a new order number if the user hasn't changed the
my $stock_info = [];
foreach my $i (1..$form->{rowcount}) {
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) };
}
- $main::lxdebug->dump(0, "si", $stock_info);
display_stock_in_form($stock_info);
my $part_info = IC->get_basic_part_info('id' => $form->{parts_id});
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit});
- my $access = $auth->check_right($form->{login}, 'all_warehouses') ? undef : $form->{login};
-
$form->get_lists('warehouses' => { 'key' => 'WAREHOUSES',
- 'bins' => 'BINS',
- 'access' => $access, });
+ 'bins' => 'BINS' });
- redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed});
+ redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{delivered});
get_basic_bin_wh_info($stock_info);
my $part_info = IC->get_basic_part_info('id' => $form->{parts_id});
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit});
my @contents = DO->get_item_availability('parts_id' => $form->{parts_id});
my $stock_info = DO->unpack_stock_information('packed' => $form->{stock});
- if (!$form->{closed}) {
+ if (!$form->{delivered}) {
foreach my $row (@contents) {
$row->{available_qty} = $form->format_amount_units('amount' => $row->{qty} * 1,
'part_unit' => $part_info->{unit},
$form->header();
print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data,
- 'WHCONTENTS' => $form->{closed} ? $stock_info : \@contents,
+ 'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents,
'PART_INFO' => $part_info, });
$lxdebug->leave_sub();
$lxdebug->leave_sub();
}
-sub transfer_in_and_close {
+sub transfer_in {
$lxdebug->enter_sub();
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount});
my @all_requests;
if (@part_ids) {
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my %part_info_map = IC->get_basic_part_info('id' => \@part_ids);
my %request_map;
}
if (@{ $form->{ERRORS} }) {
- push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
+ push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
update();
$lxdebug->leave_sub();
DO->transfer_in_out('direction' => 'in',
'requests' => \@all_requests);
- $form->{closed} = 1;
$form->{delivered} = 1;
save();
$lxdebug->leave_sub();
}
-sub transfer_out_and_close {
+sub transfer_out {
$lxdebug->enter_sub();
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount});
my @all_requests;
if (@part_ids) {
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my %part_info_map = IC->get_basic_part_info('id' => \@part_ids);
my %request_map;
}
if (@{ $form->{ERRORS} }) {
- push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
+ push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
update();
$lxdebug->leave_sub();
DO->transfer_in_out('direction' => 'out',
'requests' => \@all_requests);
- $form->{closed} = 1;
$form->{delivered} = 1;
save();
projects / kivitendo-erp.git / blobdiff