X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=a583f8d1487fdcb25397553c1f81652061131131;hb=26dfef7da64e9712db783fb666bb6af80b89675e;hp=e946e4e4b6573c27744a7b07b208a96288d3eb9b;hpb=5b8e9fcb2f9c94d69519c927b8aa59184d93cea3;p=kivitendo-erp.git
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index e946e4e4b..a583f8d14 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -30,6 +30,8 @@
# Delivery orders
#======================================================================
+use Carp;
+use List::MoreUtils qw(uniq);
use List::Util qw(max sum);
use POSIX qw(strftime);
use YAML;
@@ -38,12 +40,12 @@ use SL::DB::DeliveryOrder;
use SL::DO;
use SL::IR;
use SL::IS;
-use SL::MoreCommon qw(ary_diff);
+use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::ReportGenerator;
use SL::WH;
+use Sort::Naturally ();
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
-require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/io.pl";
require "bin/mozilla/reportgenerator.pl";
@@ -85,10 +87,15 @@ sub add {
check_do_access();
+ if (($::form->{type} =~ /purchase/) && !$::instance_conf->get_allow_new_purchase_invoice) {
+ $::form->show_generic_error($::locale->text("You do not have the permissions to access this function."));
+ }
+
my $form = $main::form;
set_headings("add");
+ $form->{show_details} = $::myconfig{show_form_details};
$form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback});
order_links();
@@ -105,6 +112,8 @@ sub edit {
my $form = $main::form;
+ $form->{show_details} = $::myconfig{show_form_details};
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
@@ -166,15 +175,12 @@ sub order_links {
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
- $form->{webdav} = $::instance_conf->get_webdav;
-
my $editing = $form->{id};
DO->retrieve('vc' => $form->{vc},
'ids' => $form->{id});
$form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes delivery_term_id currency));
- $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
# get customer / vendor
if ($form->{vc} eq 'vendor') {
@@ -255,22 +261,31 @@ sub form_header {
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
- my @old_project_ids = ($form->{"globalproject_id"});
- map({ push(@old_project_ids, $form->{"project_id_$_"})
- if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
-
my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
- $form->get_lists("projects" => {
- "key" => "ALL_PROJECTS",
- "all" => 0,
- "old_id" => \@old_project_ids
- },
- $vc => "ALL_VC",
+ $form->get_lists($vc => "ALL_VC",
"price_factors" => "ALL_PRICE_FACTORS",
"departments" => "ALL_DEPARTMENTS",
"business_types" => "ALL_BUSINESS_TYPES",
);
+ # Projects
+ my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
+ my @old_ids_cond = @old_project_ids ? (id => \@old_project_ids) : ();
+ my @customer_cond;
+ if (($vc eq 'customers') && $::instance_conf->get_customer_projects_only_in_sales) {
+ @customer_cond = (
+ or => [
+ customer_id => $::form->{customer_id},
+ billable_customer_id => $::form->{customer_id},
+ ]);
+ }
+ my @conditions = (
+ or => [
+ and => [ active => 1, @customer_cond ],
+ @old_ids_cond,
+ ]);
+
+ $::form->{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => \@conditions);
$::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{employee_id}, deleted => 0 ] ]);
$::form->{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{salesman_id}, deleted => 0 ] ]);
$::form->{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all_sorted(query => [
@@ -310,7 +325,12 @@ sub form_header {
$form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')';
- $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase));
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
+
+ my @custom_hidden;
+ push @custom_hidden, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
+
+ $::form->{HIDDENS} = [ map { +{ name => $_, value => $::form->{$_} } } (@custom_hidden) ];
$form->header();
# Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
@@ -356,6 +376,8 @@ sub update_delivery_order {
set_headings($form->{"id"} ? "edit" : "add");
+ $form->{insertdate} = SL::DB::DeliveryOrder->new(id => $form->{id})->load->itime_as_date if $form->{id};
+
$form->{update} = 1;
my $payment_id;
@@ -377,7 +399,6 @@ sub update_delivery_order {
# Kunde mit Rabatt 20 -> Rabatt 5,5 i.O.
$form->{payment_id} = $payment_id if $form->{payment_id} eq "";
- # for pricegroups
my $i = $form->{rowcount};
if ( ($form->{"partnumber_$i"} eq "")
@@ -407,23 +428,39 @@ sub update_delivery_order {
if ($rows > 1) {
- select_item(mode => $mode);
- ::end_of_request();
+ select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
+ $::dispatcher->end_request;
} else {
+ my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
+
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
$form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
- $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"} * (1 - $form->{tradediscount}));
- $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
- # get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ if ($sellprice) {
+ $form->{"sellprice_$i"} = $sellprice;
+ } else {
+ my $record = _make_record();
+ my $price_source = SL::PriceSource->new(record_item => $record->items->[$i-1], record => $record);
+ my $best_price = $price_source->best_price;
+ my $best_discount = $price_source->best_discount;
+
+ if ($best_price) {
+ $::form->{"sellprice_$i"} = $best_price->price;
+ $::form->{"active_price_source_$i"} = $best_price->source;
+ }
+ if ($best_discount) {
+ $::form->{"discount_$i"} = $best_discount->discount;
+ $::form->{"active_discount_source_$i"} = $best_discount->source;
+ }
+ }
- # build up html code for prices_$i
- &set_pricegroup($i);
+ $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
+ $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0);
}
display_form();
@@ -462,10 +499,11 @@ sub search {
$form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer';
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 1 },
- "departments" => "ALL_DEPARTMENTS",
- "$form->{vc}s" => "ALL_VC");
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 },
+ "departments" => "ALL_DEPARTMENTS",
+ "$form->{vc}s" => "ALL_VC",
+ "business_types" => "ALL_BUSINESS_TYPES");
$form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
$form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
@@ -505,6 +543,7 @@ sub orders {
shipvia globalprojectnumber
transaction_description department
open delivered
+ insertdate
);
$form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed});
@@ -519,7 +558,8 @@ sub orders {
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
transaction_description transdatefrom transdateto reqdatefrom reqdateto
- type vc employee_id salesman_id project_id);
+ type vc employee_id salesman_id project_id parts_partnumber parts_description
+ insertdatefrom insertdateto business_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
@@ -541,9 +581,10 @@ sub orders {
'open' => { 'text' => $locale->text('Open'), },
'delivered' => { 'text' => $locale->text('Delivered'), },
'department' => { 'text' => $locale->text('Department'), },
+ 'insertdate' => { 'text' => $locale->text('Insert Date'), },
);
- foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department)) {
+ foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department insertdate)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
@@ -567,6 +608,9 @@ sub orders {
if ($form->{vendor}) {
push @options, $locale->text('Vendor') . " : $form->{vendor}";
}
+ if ($form->{cp_name}) {
+ push @options, $locale->text('Contact Person') . " : $form->{cp_name}";
+ }
if ($form->{department}) {
my ($department) = split /--/, $form->{department};
push @options, $locale->text('Department') . " : $department";
@@ -578,9 +622,19 @@ sub orders {
push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
}
push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber};
+ if ($form->{business_id}) {
+ my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type');
+ push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description;
+ }
if ($form->{transaction_description}) {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
+ if ($form->{parts_description}) {
+ push @options, $locale->text('Part Description') . " : $form->{parts_description}";
+ }
+ if ($form->{parts_partnumber}) {
+ push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}";
+ }
if ( $form->{transdatefrom} or $form->{transdateto} ) {
push @options, $locale->text('Delivery Order Date');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
@@ -591,6 +645,11 @@ sub orders {
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom};
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto};
};
+ if ( $form->{insertdatefrom} or $form->{insertdateto} ) {
+ push @options, $locale->text('Insert Date');
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1) if $form->{insertdatefrom};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{insertdateto}, 1) if $form->{insertdateto};
+ };
if ($form->{open}) {
push @options, $locale->text('Open');
}
@@ -661,6 +720,8 @@ sub save {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
+ $form->mtime_ischanged('delivery_orders');
+
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->isblank("transdate", $locale->text('Delivery Order Date missing!'));
@@ -680,7 +741,7 @@ sub save {
# if the name changed get new values
if (check_name($form->{vc})) {
update();
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
@@ -698,7 +759,7 @@ sub save {
if (!$params{no_redirect} && !$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
edit();
- ::end_of_request();
+ $::dispatcher->end_request;
}
$main::lxdebug->leave_sub();
}
@@ -722,7 +783,7 @@ sub delete {
# /saving the history
$form->info($locale->text('Delivery Order deleted!'));
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->error($locale->text('Cannot delete delivery order!'));
@@ -738,6 +799,8 @@ sub invoice {
my $locale = $main::locale;
check_do_access();
+ $form->mtime_ischanged('delivery_orders');
+
$main::auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');
$form->{convert_from_do_ids} = $form->{id};
@@ -774,19 +837,20 @@ sub invoice {
}
}
}
- map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice lastcost basefactor);
+ map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor discount);
+ $form->{"donumber_$i"} = $form->{donumber};
+ $form->{"converted_from_delivery_order_items_id_$i"} = delete $form->{"delivery_order_items_id_$i"};
}
$form->{type} = "invoice";
# locale messages
- $main::locale = new Locale "$myconfig{countrycode}", "$script";
+ $main::locale = Locale->new("$myconfig{countrycode}", "$script");
$locale = $main::locale;
require "bin/mozilla/$form->{script}";
my $currency = $form->{currency};
- $form->{shipto} = 1 if $form->{convert_from_do_ids};
invoice_links();
if ($form->{ordnumber}) {
@@ -833,13 +897,6 @@ sub invoice {
}
- # show pricegroup in newly loaded invoice when creating invoice from delivery order
- for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
- }
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
- set_pricegroup($form->{rowcount});
-
display_form();
$main::lxdebug->leave_sub();
@@ -912,7 +969,8 @@ sub invoice_multi {
IS->get_customer(\%myconfig, \%$form);
$vc_discount = $form->{customer_discount};
}
- restore_form($saved_form);
+ # use payment terms from customer or vendor
+ restore_form($saved_form,0,qw(payment_id));
$form->{rowcount} = 0;
foreach my $ref (@{ $form->{form_details} }) {
@@ -920,6 +978,7 @@ sub invoice_multi {
$ref->{reqdate} ||= $ref->{dord_transdate}; # copy transdates into each invoice row
map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice lastcost);
+ $form->{"converted_from_delivery_order_items_id_$form->{rowcount}"} = delete $form->{"delivery_order_items_id_$form->{rowcount}"};
if ($vc_discount){ # falls wir einen Lieferanten/Kundenrabatt haben
# und keinen anderen discount wert an $i ...
@@ -934,20 +993,13 @@ sub invoice_multi {
}
delete $form->{form_details};
- $locale = new Locale "$myconfig{countrycode}", "$script";
+ $locale = Locale->new("$myconfig{countrycode}", "$script");
require "bin/mozilla/$form->{script}";
invoice_links();
prepare_invoice();
- # show pricegroup in newly loaded invoice when creating invoice from delivery order
- for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
- }
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
- set_pricegroup($_) for 1 .. $form->{rowcount};
-
display_form();
$main::lxdebug->leave_sub();
@@ -965,7 +1017,7 @@ sub save_as_new {
$form->{delivered} = 0;
map { delete $form->{$_} } qw(printed emailed queued);
delete @{ $form }{ grep { m/^stock_(?:in|out)_\d+/ } keys %{ $form } };
-
+ $form->{"converted_from_delivery_order_items_id_$_"} = delete $form->{"delivery_order_items_id_$_"} for 1 .. $form->{"rowcount"};
# Let kivitendo assign a new order number if the user hasn't changed the
# previous one. If it has been changed manually then use it as-is.
$form->{donumber} =~ s/^\s*//g;
@@ -984,9 +1036,9 @@ sub e_mail {
check_do_access();
- my $form = $main::form;
+ $::form->mtime_ischanged('delivery_orders','mail');
- $form->{print_and_save} = 1;
+ $::form->{print_and_save} = 1;
my $saved_form = save_form();
@@ -1094,7 +1146,8 @@ sub update_stock_in {
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 bestbefore qty unit) };
+ push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber
+ bestbefore qty unit delivery_order_items_stock_id) };
}
display_stock_in_form($stock_info);
@@ -1177,7 +1230,7 @@ sub set_stock_in {
next if ($form->{"qty_$i"} <= 0);
- push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber bestbefore qty unit) };
+ push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(delivery_order_items_stock_id warehouse_id bin_id chargenumber bestbefore qty unit) };
}
$form->{stock} = YAML::Dump($stock_info);
@@ -1226,7 +1279,7 @@ sub stock_out_form {
($row->{chargenumber} ne $sinfo->{chargenumber}) ||
($row->{bestbefore} ne $sinfo->{bestbefore}));
- map { $row->{"stock_$_"} = $sinfo->{$_} } qw(qty unit error);
+ map { $row->{"stock_$_"} = $sinfo->{$_} } qw(qty unit error delivery_order_items_stock_id);
}
}
@@ -1268,6 +1321,7 @@ sub set_stock_out {
'qty' => $form->{"qty_$i"},
'unit' => $form->{"unit_$i"},
'row' => $i,
+ 'delivery_order_items_stock_id' => $form->{"delivery_order_items_stock_id_$i"},
};
}
@@ -1351,7 +1405,7 @@ sub transfer_in {
update();
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
@@ -1470,7 +1524,7 @@ sub transfer_out {
update();
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
DO->transfer_in_out('direction' => 'out',
@@ -1498,6 +1552,27 @@ sub mark_closed {
$main::lxdebug->leave_sub();
}
+sub display_form {
+ $::lxdebug->enter_sub;
+
+ $::auth->assert('purchase_delivery_order_edit | sales_delivery_order_edit');
+
+ relink_accounts();
+ retrieve_partunits();
+
+ my $new_rowcount = $::form->{"rowcount"} * 1 + 1;
+ $::form->{"project_id_${new_rowcount}"} = $::form->{"globalproject_id"};
+
+ $::form->language_payment(\%::myconfig);
+
+ Common::webdav_folder($::form);
+
+ form_header();
+ display_row(++$::form->{rowcount});
+ form_footer();
+
+ $::lxdebug->leave_sub;
+}
sub yes {
call_sub($main::form->{yes_nextsub});
@@ -1515,7 +1590,7 @@ sub dispatcher {
my $form = $main::form;
my $locale = $main::locale;
- foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default
+ foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default sort
transfer_in transfer_in_default mark_closed save_as_new invoice delete)) {
if ($form->{"action_${action}"}) {
call_sub($action);
@@ -1578,20 +1653,29 @@ sub transfer_in_out_default {
next unless ($form->{"id_$i"});
my $base_unit_factor = $units->{ $part_info_map{$form->{"id_$i"}}->{unit} }->{factor} || 1;
my $qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
- $qty_parts{$form->{"id_$i"}} += $qty;
+ $form->show_generic_error($locale->text("Cannot transfer negative entries." ), 'back_button' => 1) if ($qty < 0);
+ # if we do not want to transfer services and this part is a service, set qty to zero
+ # ... and do not create a hash entry in %qty_parts below (will skip check for bins for the transfer == out case)
+ # ... and push only a empty (undef) element to @all_requests (will skip check for bin_id and warehouse_id and will not alter the row)
+
+ $qty = 0 if (!$::instance_conf->get_transfer_default_services && !defined($part_info_map{$form->{"id_$i"}}->{inventory_accno_id}) && !$part_info_map{$form->{"id_$i"}}->{assembly});
+ $qty_parts{$form->{"id_$i"}} += $qty;
+ if ($qty == 0) {
+ delete $qty_parts{$form->{"id_$i"}} unless $qty_parts{$form->{"id_$i"}};
+ undef $form->{"stock_in_$i"};
+ }
$part_info_map{$form->{"id_$i"}}{bin_id} ||= $default_bin_id;
$part_info_map{$form->{"id_$i"}}{warehouse_id} ||= $default_warehouse_id;
- push @all_requests, {
+ push @all_requests, ($qty == 0) ? { } : {
'chargenumber' => '', #?? die müsste entsprechend geholt werden
#'bestbefore' => undef, # TODO wird nicht berücksichtigt
'bin_id' => $part_info_map{$form->{"id_$i"}}{bin_id},
'qty' => $qty,
'parts_id' => $form->{"id_$i"},
- 'comment' => 'Default transfer DO',
- 'ok' => 1,
+ 'comment' => $locale->text("Default transfer delivery order"),
'unit' => $part_info_map{$form->{"id_$i"}}{unit},
'warehouse_id' => $part_info_map{$form->{"id_$i"}}{warehouse_id},
'oe_id' => $form->{id},
@@ -1600,12 +1684,13 @@ sub transfer_in_out_default {
}
# jetzt wird erst überprüft, ob die Stückzahl entsprechend stimmt.
- if ($params{direction} eq 'out') { # wird nur für ausgehende Mengen benötigit
- foreach my $key (keys %qty_parts) {
+ # check if bin (transfer in and transfer out and qty (transfer out) is correct
+ foreach my $key (keys %qty_parts) {
- $missing_default_bins{$key}{missing_bin} = 1 unless ($part_info_map{$key}{bin_id});
- next unless ($part_info_map{$key}{bin_id}); # abbruch
+ $missing_default_bins{$key}{missing_bin} = 1 unless ($part_info_map{$key}{bin_id});
+ next unless ($part_info_map{$key}{bin_id}); # abbruch
+ if ($params{direction} eq 'out') { # wird nur für ausgehende Mengen benötigt
my ($max_qty, $error) = WH->get_max_qty_parts_bin(parts_id => $key, bin_id => $part_info_map{$key}{bin_id});
if ($error == 1) {
# wir können nicht entscheiden, welche charge oder mhd (bestbefore) ausgewählt sein soll
@@ -1668,14 +1753,25 @@ sub transfer_in_out_default {
# dieser array_ref ist für DO->save da:
# einmal die all_requests in YAML verwandeln, damit delivery_order_items_stock
# gefüllt werden kann.
- my $i = 1;
+ # could be dumped to the form in the first loop,
+ # but maybe bin_id and warehouse_id has changed to the "korrekturlager" with
+ # allowed negative qty ($::instance_conf->get_warehouse_id_ignore_onhand) ...
+ my $i = 0;
foreach (@all_requests){
- $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]);
$i++;
+ next unless scalar(%{ $_ });
+ $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]);
}
save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern
# und in delivery_order_items_stock speichern
+
+ # ... and fill back the persistent dois_id for inventory fk
+ undef (@all_requests);
+ foreach my $i (1 .. $form->{rowcount}) {
+ next unless ($form->{"id_$i"} && $form->{"stock_${prefix}_$i"});
+ push @all_requests, @{ DO->unpack_stock_information('packed' => $form->{"stock_${prefix}_$i"}) };
+ }
DO->transfer_in_out('direction' => $prefix,
'requests' => \@all_requests);
@@ -1686,3 +1782,70 @@ sub transfer_in_out_default {
$form->redirect;
}
+
+sub sort {
+ $main::lxdebug->enter_sub();
+
+ check_do_access();
+
+ my $form = $main::form;
+ my %temp_hash;
+
+ save(no_redirect => 1); # has to be done, at least for newly added positions
+
+ # hashify partnumbers, positions. key is delivery_order_items_id
+ for my $i (1 .. ($form->{rowcount}) ) {
+ $temp_hash{$form->{"delivery_order_items_id_$i"}} = { runningnumber => $form->{"runningnumber_$i"}, partnumber => $form->{"partnumber_$i"} };
+ if ($form->{id} && $form->{"discount_$i"}) {
+ # prepare_order assumes a db value if there is a form->id and multiplies *100
+ # We hope for new controller code (no more format_amount/parse_amount distinction)
+ $form->{"discount_$i"} /=100;
+ }
+ }
+ # naturally sort partnumbers and get a sorted array of doi_ids
+ my @sorted_doi_ids = sort { Sort::Naturally::ncmp($temp_hash{$a}->{"partnumber"}, $temp_hash{$b}->{"partnumber"}) } keys %temp_hash;
+
+
+ my $new_number = 1;
+
+ for (@sorted_doi_ids) {
+ $form->{"runningnumber_$temp_hash{$_}->{runningnumber}"} = $new_number;
+ $new_number++;
+ }
+ # all parse_amounts changes are in form (i.e. , to .) therefore we need
+ # another format_amount to change it back, for the next save ;-(
+ # works great except for row discounts (see above comment)
+ prepare_order();
+
+
+ $main::lxdebug->leave_sub();
+ save();
+}
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+do.pl - Script for all calls to delivery order
+
+
+=head1 FUNCTIONS
+
+=over 2
+
+=item C
+
+Sorts all position with Natural Sort. Can be activated in form_footer.html like this
+Cinput class="submit" type="submit" name="action_sort" id="sort_button" value="[% 'Sort and Save' | $T8 %]"E>
+
+=back
+
+=head1 TODO
+
+Sort and Save can be implemented as an optional button if configuration ca be set by client config.
+Example coding for database scripts and templates in (git show af2f24b8), check also
+autogeneration for rose (scripts/rose_auto_create_model.pl --h)