# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Delivery orders
#======================================================================
+use Carp;
use List::MoreUtils qw(uniq);
use List::Util qw(max sum);
use POSIX qw(strftime);
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";
set_headings("add");
+ $form->{show_details} = $::myconfig{show_form_details};
$form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback});
order_links();
my $form = $main::form;
+ $form->{show_details} = $::myconfig{show_form_details};
+
# show history button
$form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
#/show hhistory button
my $form = $main::form;
my %myconfig = %main::myconfig;
- # get customer/vendor
- $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},
$form->restore_vars(qw(taxincluded)) if $form->{id};
$form->restore_vars(qw(salesman_id)) if $editing;
- if ($form->{"all_$form->{vc}"}) {
- unless ($form->{"$form->{vc}_id"}) {
- $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
- }
- }
-
- ($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} };
- $form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
-
- $form->{employee} = "$form->{employee}--$form->{employee_id}";
-
$main::lxdebug->leave_sub();
}
my $form = $main::form;
my %myconfig = %main::myconfig;
+ my $class = "SL::DB::" . ($form->{vc} eq 'customer' ? 'Customer' : 'Vendor');
+ $form->{VC_OBJ} = $class->load_cached($form->{ $form->{vc} . '_id' });
+
$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 $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
- $form->get_lists($vc => "ALL_VC",
- "price_factors" => "ALL_PRICE_FACTORS",
- "departments" => "ALL_DEPARTMENTS",
+ $form->get_lists("price_factors" => "ALL_PRICE_FACTORS",
"business_types" => "ALL_BUSINESS_TYPES",
);
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
# Projects
my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
]
]);
- map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} };
- map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} };
-
- $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
-
- $form->{oldvcname} = $form->{"old$form->{vc}"};
- $form->{oldvcname} =~ s/--.*//;
-
my $dispatch_to_popup = '';
if ($form->{resubmit} && ($form->{format} eq "html")) {
$dispatch_to_popup = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
$::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
- my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
- $follow_up_vc =~ s/--\d*\s*$//;
-
- $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')';
+ $form->{follow_up_trans_info} = $form->{donumber} .'('. $form->{VC_OBJ}->name .')';
$::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'
# und Erweiterung für Bug 1760:
my $payment_id;
$payment_id = $form->{payment_id} if $form->{payment_id};
- check_name($form->{vc});
+ my $vc = $form->{vc};
+ if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
+ $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
+
+ IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+ IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor';
+ }
+
$form->{discount} = $form->{"$form->{vc}_discount"} if defined $form->{"$form->{vc}_discount"};
# Problem: Wenn man ohne Erneuern einen Kunden/Lieferanten
# wechselt, wird der entsprechende Kunden/ Lieferantenrabatt
if ($rows > 1) {
select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
- ::end_of_request();
+ $::dispatcher->end_request;
} else {
$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 },
+ "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} };
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
$form->{title} = $locale->text('Delivery Orders');
$form->header();
my $locale = $main::locale;
my $cgi = $::request->{cgi};
- $form->{department_id} = (split /--/, $form->{department})[-1];
($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
report_generator_set_default_sort('transdate', 1);
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
- insertdatefrom insertdateto);
+ 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);
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";
+ if ($form->{department_id}) {
+ push @options, $locale->text('Department') . " : " . SL::DB::Department->new(id => $form->{department_id})->load->description;
}
if ($form->{donumber}) {
push @options, $locale->text('Delivery Order Number') . " : $form->{donumber}";
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};
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!'));
$form->{donumber} =~ s/\s*$//g;
my $msg = ucfirst $form->{vc};
- $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
+ $form->isblank($form->{vc} . "_id", $locale->text($msg . " missing!"));
# $locale->text('Customer missing!');
# $locale->text('Vendor missing!');
validate_items();
# if the name changed get new values
- if (check_name($form->{vc})) {
+ my $vc = $form->{vc};
+ if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
+ $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
+
+ IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+ IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor';
+
update();
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
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();
}
# /saving the history
$form->info($locale->text('Delivery Order deleted!'));
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->error($locale->text('Cannot delete delivery order!'));
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};
}
for my $i (1 .. $form->{rowcount}) {
+ map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor discount);
# für bug 1284
+ # adds a customer/vendor discount, unless we have a workflow case
+ # CAVEAT: has to be done, after the above parse_amount
unless ($form->{"ordnumber"}) {
if ($form->{discount}) { # Falls wir einen Lieferanten-/Kundenrabatt haben
# und rabattfähig sind, dann
}
}
}
- map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice lastcost basefactor);
$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 @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);
+ $form->show_generic_error($locale->text('You have not selected any delivery order.'));
}
map { delete $form->{$_} } grep { m/^(?:trans|multi)_id_\d+/ } keys %{ $form };
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} }) {
}
delete $form->{form_details};
- $locale = new Locale "$myconfig{countrycode}", "$script";
+ $locale = Locale->new("$myconfig{countrycode}", "$script");
require "bin/mozilla/$form->{script}";
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();
my $locale = $main::locale;
if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) {
- $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.'), 'back_button' => 1);
+ $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.'));
}
save(no_redirect => 1);
update();
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
my $locale = $main::locale;
if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) {
- $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.'), 'back_button' => 1);
+ $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.'));
}
save(no_redirect => 1);
update();
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
DO->transfer_in_out('direction' => 'out',
$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});
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);
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;
- $form->show_generic_error($locale->text("Cannot transfer negative entries." ), 'back_button' => 1) if ($qty < 0);
+ $form->show_generic_error($locale->text("Cannot transfer negative entries." )) 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)
}
} else {
#$main::lxdebug->message(0, 'Fehlertext: ' . $fehlertext);
- $form->show_generic_error($locale->text("Cannot transfer. <br> Reason:<br>#1", $fehlertext ), 'back_button' => 1);
+ $form->show_generic_error($locale->text("Cannot transfer. <br> Reason:<br>#1", $fehlertext ));
}
}
}
# 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.
+ # 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){
$i++;
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);
$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<sort>
+
+Sorts all position with Natural Sort. Can be activated in form_footer.html like this
+C<E<lt>input class="submit" type="submit" name="action_sort" id="sort_button" value="[% 'Sort and Save' | $T8 %]"E<gt>>
+
+=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)
projects / kivitendo-erp.git / blobdiff