X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=d4fa8160fa8ee0e492b6cc0763540609f9861188;hb=94f5cb152afa9210162295b6727801c296af0631;hp=248bbb1f83e5261cbde9a776cdb3e673acd24fcb;hpb=172936e967f916e736a61a9177cbe1d53d42907e;p=kivitendo-erp.git
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 248bbb1f8..e0b4dbc54 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -24,25 +24,31 @@
# 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 YAML;
+use SL::Controller::DeliveryOrder;
use SL::DB::DeliveryOrder;
+use SL::DB::DeliveryOrder::TypeData qw(:types validate_type);
+use SL::Helper::UserPreferences::DisplayPreferences;
use SL::DO;
use SL::IR;
use SL::IS;
+use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::ReportGenerator;
use SL::WH;
-require "bin/mozilla/arap.pl";
+use SL::YAML;
+use Sort::Naturally ();
require "bin/mozilla/common.pl";
-require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/io.pl";
require "bin/mozilla/reportgenerator.pl";
@@ -52,8 +58,18 @@ use strict;
# end of main
+sub check_do_access_for_edit {
+ validate_type($::form->{type});
+
+ my $right = SL::DB::DeliveryOrder::TypeData::get3($::form->{type}, "rights", "edit");
+ $main::auth->assert($right);
+}
+
sub check_do_access {
- $main::auth->assert($main::form->{type} . '_edit');
+ validate_type($::form->{type});
+
+ my $right = SL::DB::DeliveryOrder::TypeData::get3($::form->{type}, "rights", "view");
+ $main::auth->assert($right);
}
sub set_headings {
@@ -82,15 +98,20 @@ sub set_headings {
sub add {
$main::lxdebug->enter_sub();
- check_do_access();
+ check_do_access_for_edit();
+
+ 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();
+ order_links(is_new => 1);
prepare_order();
display_form();
@@ -104,6 +125,8 @@ sub edit {
my $form = $main::form;
+ $form->{show_details} = $::myconfig{show_form_details};
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
@@ -158,23 +181,17 @@ sub order_links {
check_do_access();
+ my %params = @_;
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} = $::lx_office_conf{features}->{webdav};
- $form->{jsscript} = 1;
-
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 currency));
- $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes delivery_term_id currency));
# get customer / vendor
if ($form->{vc} eq 'vendor') {
@@ -183,24 +200,14 @@ sub order_links {
} else {
IS->get_customer(\%myconfig, \%$form);
$form->{discount} = $form->{customer_discount};
+ $form->{billing_address_id} = $form->{default_billing_address_id} if $params{is_new};
}
- $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
+ $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id delivery_term_id));
$form->restore_vars(qw(currency)) if ($form->{id} || $form->{convert_from_oe_ids});
$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();
}
@@ -244,6 +251,203 @@ sub prepare_order {
$main::lxdebug->leave_sub();
}
+sub setup_do_action_bar {
+ my @transfer_qty = qw(kivi.SalesPurchase.delivery_order_check_transfer_qty);
+ my @req_trans_desc = qw(kivi.SalesPurchase.check_transaction_description) x!!$::instance_conf->get_require_transaction_description_ps;
+ my $is_customer = $::form->{vc} eq 'customer';
+
+ my $undo_date = DateTime->today->subtract(days => $::instance_conf->get_undo_transfer_interval);
+ my $insertdate = DateTime->from_kivitendo($::form->{insertdate});
+ my $undo_transfer = 0;
+ if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime') {
+ $undo_transfer = $insertdate > $undo_date;
+ }
+
+ my $may_edit_create = $::auth->assert(SL::DB::DeliveryOrder::TypeData::get3($::form->{type}, "rights", "edit"), 1);
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action =>
+ [ t8('Update'),
+ submit => [ '#form', { action => "update" } ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+ id => 'update_button',
+ accesskey => 'enter',
+ ],
+
+ combobox => [
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save" } ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : $::form->{delivered} ? t8('This record has already been delivered.')
+ : undef,
+ ],
+ action => [
+ t8('Save as new'),
+ submit => [ '#form', { action => "save_as_new" } ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : !$::form->{id},
+ ],
+ action => [
+ t8('Mark as closed'),
+ submit => [ '#form', { action => "mark_closed" } ],
+ checks => [ 'kivi.validate_form' ],
+ confirm => t8('This will remove the delivery order from showing as open even if contents are not delivered. Proceed?'),
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : !$::form->{id} ? t8('This record has not been saved yet.')
+ : $::form->{closed} ? t8('This record has already been closed.')
+ : undef,
+ ],
+ ], # end of combobox "Save"
+
+ action => [
+ t8('Delete'),
+ submit => [ '#form', { action => "delete" } ],
+ confirm => t8('Do you really want to delete this object?'),
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : !$::form->{id} ? t8('This record has not been saved yet.')
+ : $::form->{delivered} ? t8('This record has already been delivered.')
+ : ($::form->{vc} eq 'customer' && !$::instance_conf->get_sales_delivery_order_show_delete) ? t8('Deleting this type of record has been disabled in the configuration.')
+ : ($::form->{vc} eq 'vendor' && !$::instance_conf->get_purchase_delivery_order_show_delete) ? t8('Deleting this type of record has been disabled in the configuration.')
+ : undef,
+ ],
+
+ combobox => [
+ action => [
+ t8('Transfer out'),
+ submit => [ '#form', { action => "transfer_out" } ],
+ checks => [ 'kivi.validate_form', @transfer_qty ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : $::form->{delivered} ? t8('This record has already been delivered.')
+ : undef,
+ only_if => $is_customer,
+ ],
+ action => [
+ t8('Transfer out via default'),
+ submit => [ '#form', { action => "transfer_out_default" } ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : $::form->{delivered} ? t8('This record has already been delivered.')
+ : undef,
+ only_if => $is_customer && $::instance_conf->get_transfer_default,
+ ],
+ action => [
+ t8('Transfer in'),
+ submit => [ '#form', { action => "transfer_in" } ],
+ checks => [ 'kivi.validate_form', @transfer_qty ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : $::form->{delivered} ? t8('This record has already been delivered.')
+ : undef,
+ only_if => !$is_customer,
+ ],
+ action => [
+ t8('Transfer in via default'),
+ submit => [ '#form', { action => "transfer_in_default" } ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : $::form->{delivered} ? t8('This record has already been delivered.')
+ : undef,
+ only_if => !$is_customer && $::instance_conf->get_transfer_default,
+ ],
+ action => [
+ t8('Undo Transfer'),
+ submit => [ '#form', { action => "delete_transfers" } ],
+ checks => [ 'kivi.validate_form' ],
+ only_if => $::form->{delivered},
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : !$undo_transfer ? t8('Transfer date exceeds the maximum allowed interval.')
+ : undef,
+ ],
+ ], # end of combobox "Transfer out"
+
+
+ 'separator',
+
+ action => [
+ t8('Invoice'),
+ submit => [ '#form', { action => "invoice" } ],
+ disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
+ confirm => $::form->{delivered} ? undef
+ : ($::form->{vc} eq 'customer' && $::instance_conf->get_sales_delivery_order_check_stocked) ? t8('This record has not been stocked out. Proceed?')
+ : ($::form->{vc} eq 'vendor' && $::instance_conf->get_purchase_delivery_order_check_stocked) ? t8('This record has not been stocked in. Proceed?')
+ : undef,
+ ],
+
+ combobox => [
+ action => [ t8('Export') ],
+ action => [
+ t8('Print'),
+ call => [ 'kivi.SalesPurchase.show_print_dialog' ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+ ],
+ action => [
+ t8('E Mail'),
+ call => [ 'kivi.SalesPurchase.show_email_dialog' ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+ : !$::form->{id} ? t8('This record has not been saved yet.')
+ : undef,
+ ],
+ ], # end of combobox "Export"
+
+ combobox => [
+ action => [ t8('more') ],
+ action => [
+ t8('History'),
+ call => [ 'set_history_window', $::form->{id} * 1, 'id' ],
+ disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
+ ],
+ action => [
+ t8('Follow-Up'),
+ call => [ 'follow_up_window' ],
+ disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
+ ],
+ ], # end if combobox "more"
+ );
+ }
+ $::request->layout->add_javascripts('kivi.Validator.js');
+}
+
+sub setup_do_search_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Search'),
+ submit => [ '#form' ],
+ accesskey => 'enter',
+ checks => [ 'kivi.validate_form' ],
+ ],
+ );
+ }
+ $::request->layout->add_javascripts('kivi.Validator.js');
+}
+
+sub setup_do_orders_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('New invoice'),
+ submit => [ '#form', { action => 'invoice_multi' } ],
+ checks => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ],
+ accesskey => 'enter',
+ ],
+ action => [
+ t8('Print'),
+ call => [ 'kivi.SalesPurchase.show_print_dialog', 'js:kivi.MassDeliveryOrderPrint.submitMultiOrders' ],
+ checks => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ],
+ ],
+ );
+ }
+}
+
sub form_header {
$main::lxdebug->enter_sub();
@@ -252,34 +456,47 @@ sub form_header {
my $form = $main::form;
my %myconfig = %main::myconfig;
- $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
- $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
-
- # use JavaScript Calendar or not
- $form->{jsscript} = 1;
+ my $class = "SL::DB::" . ($form->{vc} eq 'customer' ? 'Customer' : 'Vendor');
+ $form->{VC_OBJ} = $class->load_cached($form->{ $form->{vc} . '_id' });
- my @old_project_ids = ($form->{"globalproject_id"});
- map({ push(@old_project_ids, $form->{"project_id_$_"})
- if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+ $form->{CONTACT_OBJ} = $form->{cp_id} ? SL::DB::Contact->load_cached($form->{cp_id}) : undef;
+ my $current_employee = SL::DB::Manager::Employee->current;
+ $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
+ $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
+ $form->{employee_id} ||= $current_employee->id;
+ $form->{salesman_id} ||= $current_employee->id;
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",
- "price_factors" => "ALL_PRICE_FACTORS",
- "departments" => "ALL_DEPARTMENTS",
+ $form->get_lists("price_factors" => "ALL_PRICE_FACTORS",
"business_types" => "ALL_BUSINESS_TYPES",
);
-
- $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id}, deleted => 0 ] ]);
- $::form->{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id}, deleted => 0 ] ]);
- $::form->{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all(query => [
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
+ $form->{ALL_LANGUAGES} = SL::DB::Manager::Language->get_all_sorted;
+
+ # 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 => [
or => [ trans_id => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
]);
- $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all(query => [
+ $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(query => [
or => [
cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
and => [
@@ -289,31 +506,23 @@ sub form_header {
]
]);
- 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/--.*//;
-
- if ($form->{resubmit}) {
- my $dispatch_to_popup = '';
- if ($form->{format} eq "html") {
- $dispatch_to_popup .= "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
- }
- # emulate click for resubmitting actions
- $dispatch_to_popup .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
+ my $dispatch_to_popup = '';
+ if ($form->{resubmit} && ($form->{format} eq "html")) {
+ $dispatch_to_popup = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
$dispatch_to_popup .= "document.do.submit();";
- $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
+ } elsif ($form->{resubmit} && $form->{action_print}) {
+ # emulate click for resubmitting actions
+ $dispatch_to_popup = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();";
}
+ $::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} .'('. $form->{VC_OBJ}->name .')' if $form->{VC_OBJ};
+ $form->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
- $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')';
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.File kivi.MassDeliveryOrderPrint kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor/ckeditor ckeditor/adapters/jquery kivi.io));
- $::request->layout->use_stylesheet('presenter/record/record_list.css');
+ setup_do_action_bar();
$form->header();
# Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
@@ -340,9 +549,18 @@ sub form_footer {
my $form = $main::form;
- $form->{PRINT_OPTIONS} = print_options('inline' => 1);
+ $form->{PRINT_OPTIONS} = setup_sales_purchase_print_options();
+ $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
- print $form->parse_html_template('do/form_footer');
+ my $shipto_cvars = SL::DB::Shipto->new->cvars_by_config;
+ foreach my $var (@{ $shipto_cvars }) {
+ my $name = "shiptocvar_" . $var->config->name;
+ $var->value($form->{$name}) if exists $form->{$name};
+ }
+
+ print $form->parse_html_template('do/form_footer',
+ {transfer_default => ($::instance_conf->get_transfer_default),
+ shipto_cvars => $shipto_cvars});
$main::lxdebug->leave_sub();
}
@@ -357,12 +575,25 @@ 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;
$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};
+
+ if ($vc eq 'customer') {
+ IS->get_customer(\%myconfig, $form);
+ $::form->{billing_address_id} = $::form->{default_billing_address_id};
+ } else {
+ IR->get_vendor(\%myconfig, $form);
+ }
+ }
+
$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
@@ -378,7 +609,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 "")
@@ -401,21 +631,46 @@ sub update_delivery_order {
my $rows = scalar @{ $form->{item_list} };
if ($rows) {
- $form->{"qty_$i"} = 1 unless $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ if( !$form->{"qty_$i"} ) {
+ $form->{"qty_$i"} = 1;
+ }
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};
+
+ 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;
+ }
+ }
+
$form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
- $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$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();
@@ -454,16 +709,15 @@ 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->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
-
- $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
- $form->{jsscript} = 1;
+ $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->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
$form->{title} = $locale->text('Delivery Orders');
+ setup_do_search_action_bar();
+
$form->header();
print $form->parse_html_template('do/search');
@@ -481,7 +735,7 @@ sub orders {
my $locale = $main::locale;
my $cgi = $::request->{cgi};
- $form->{department_id} = (split /--/, $form->{department})[-1];
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.MassDeliveryOrderPrint kivi.SalesPurchase));
($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
report_generator_set_default_sort('transdate', 1);
@@ -491,13 +745,14 @@ sub orders {
$form->{rowcount} = scalar @{ $form->{DO} };
my @columns = qw(
- ids transdate
+ ids transdate reqdate
id donumber
- ordnumber customernumber
+ ordnumber customernumber cusordnumber
name employee salesman
shipvia globalprojectnumber
transaction_description department
open delivered
+ insertdate
);
$form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed});
@@ -510,18 +765,22 @@ sub orders {
my $report = SL::ReportGenerator->new(\%myconfig, $form);
my @hidden_variables = map { "l_${_}" } @columns;
- push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber
- transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id);
+ 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 parts_partnumber parts_description
+ insertdatefrom insertdateto business_id all department_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
my %column_defs = (
- 'ids' => { 'text' => '', },
- 'transdate' => { 'text' => $locale->text('Date'), },
+ 'ids' => { raw_header_data => SL::Presenter::Tag::checkbox_tag("", id => "multi_all", checkall => "[data-checkall=1]"), align => 'center' },
+ 'transdate' => { 'text' => $locale->text('Delivery Order Date'), },
+ 'reqdate' => { 'text' => $locale->text('Reqdate'), },
'id' => { 'text' => $locale->text('ID'), },
'donumber' => { 'text' => $locale->text('Delivery Order'), },
'ordnumber' => { 'text' => $locale->text('Order'), },
'customernumber' => { 'text' => $locale->text('Customer Number'), },
+ 'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), },
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
'employee' => { 'text' => $locale->text('Employee'), },
'salesman' => { 'text' => $locale->text('Salesman'), },
@@ -531,9 +790,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 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";
}
@@ -557,9 +817,11 @@ sub orders {
if ($form->{vendor}) {
push @options, $locale->text('Vendor') . " : $form->{vendor}";
}
- if ($form->{department}) {
- my ($department) = split /--/, $form->{department};
- push @options, $locale->text('Department') . " : $department";
+ if ($form->{cp_name}) {
+ push @options, $locale->text('Contact Person') . " : $form->{cp_name}";
+ }
+ 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}";
@@ -567,15 +829,35 @@ sub orders {
if ($form->{ordnumber}) {
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->{transdatefrom}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ if ($form->{parts_description}) {
+ push @options, $locale->text('Part Description') . " : $form->{parts_description}";
}
- if ($form->{transdateto}) {
- push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
+ 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};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto};
+ };
+ if ( $form->{reqdatefrom} or $form->{reqdateto} ) {
+ push @options, $locale->text('Reqdate');
+ 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');
}
@@ -588,10 +870,25 @@ sub orders {
if ($form->{notdelivered}) {
push @options, $locale->text('Not delivered');
}
+ push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all};
+
+ my $pr = SL::DB::Manager::Printer->find_by(
+ printer_description => $::locale->text("sales_delivery_order_printer"));
+ if ($pr ) {
+ $form->{printer_id} = $pr->id;
+ }
+
+ my $print_options = SL::Helper::PrintOptions->get_print_options(
+ options => {
+ hide_language_id => 1,
+ show_bothsided => 1,
+ show_headers => 1,
+ },
+ );
$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'),
+ 'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom', { print_options => $print_options }),
'output_format' => 'HTML',
'title' => $form->{title},
'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
@@ -606,7 +903,9 @@ sub orders {
my $callback = $form->escape($href);
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 $edit_order_url = ($::instance_conf->get_feature_experimental_order)
+ ? build_std_url('script=controller.pl', 'action=Order/edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'))
+ : build_std_url('script=oe.pl', 'action=edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'));
my $idx = 1;
@@ -616,20 +915,25 @@ sub orders {
my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns };
+ my $ord_id = $dord->{id};
$row->{ids} = {
- 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $dord->{id})
- . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''),
+ 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $ord_id)
+ . $cgi->checkbox('-name' => "multi_id_${idx}",' id' => "multi_id_id_".$ord_id, '-value' => 1, 'data-checkall' => 1, '-label' => ''),
'valign' => 'center',
'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);
$idx++;
}
+ setup_do_orders_action_bar();
+
$report->generate_with_headers();
$main::lxdebug->leave_sub();
@@ -640,12 +944,14 @@ sub save {
my (%params) = @_;
- check_do_access();
+ check_do_access_for_edit();
my $form = $main::form;
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!'));
@@ -654,7 +960,7 @@ sub save {
$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!');
@@ -662,24 +968,43 @@ sub save {
remove_emptied_rows();
validate_items();
+ # check for serial number if part needs one
+ for my $i (1 .. $form->{rowcount} - 1) {
+ next unless $form->{"has_sernumber_$i"};
+ $form->isblank("serialnumber_$i",
+ $locale->text('Serial Number missing in Row') . " $i");
+ }
# 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};
+
+ if ($vc eq 'customer') {
+ IS->get_customer(\%myconfig, $form);
+ $::form->{billing_address_id} = $::form->{default_billing_address_id};
+ } else {
+ IR->get_vendor(\%myconfig, $form);
+ }
+
update();
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
- # best case fix für bug 1079. Einkaufsrabatt wird nicht richtig
- # aus Lieferantenauftrag -> Lieferschein -> Rechnung übernommen
- # Tritt nur auf, wenn man direkt über Lieferschein -> speichern ->
- # Workflow Rechnung geht (beim Aufruf über edit() i.O.)
- # Gut. DO-save() speichert den Discount im DB-Format 0.12 für
- # 12%, die Konvertierung wird leider in $form gemacht und daher
- # wird die Maske mit dem falschen Rabatt wieder aufgebaut.
- # Wie immer: backup_vars verwenden um nichts anderes kaputt zu
- # machen. jan 03.03.2010
- # nicht mehr notwendig da für bug 1284 der backend aufruf entsprechend
- # geändert wurde
+ # we rely on converted_from_orderitems, if the workflow is used
+ # be sure that at least one position is linked to the original orderitem
+ if ($form->{convert_from_oe_ids}) {
+ my $has_linked_pos;
+ for my $i (1 .. $form->{rowcount}) {
+ if ($form->{"converted_from_orderitems_id_$i"}) {
+ $has_linked_pos = 1;
+ last;
+ }
+ }
+ if (!$has_linked_pos) {
+ $form->error($locale->text('Need at least one original position for the workflow Order to Delivery Order!'));
+ }
+ }
DO->save();
# saving the history
if(!exists $form->{addition}) {
@@ -691,9 +1016,9 @@ sub save {
$form->{simple_save} = 1;
if (!$params{no_redirect} && !$form->{print_and_save}) {
- set_headings("edit");
- update();
- ::end_of_request();
+ delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
+ edit();
+ $::dispatcher->end_request;
}
$main::lxdebug->leave_sub();
}
@@ -701,45 +1026,57 @@ sub save {
sub delete {
$main::lxdebug->enter_sub();
- check_do_access();
+ check_do_access_for_edit();
my $form = $main::form;
+ my %myconfig = %main::myconfig;
my $locale = $main::locale;
+ my $ret;
+ if ($ret = DO->delete()) {
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{snumbers} = qq|donumber_| . $form->{donumber};
+ $form->{addition} = "DELETED";
+ $form->save_history;
+ }
+ # /saving the history
- map { delete $form->{$_} } qw(action header login password);
- my @variables = map { { 'key' => $_, 'value' => $form->{$_} } } grep { '' eq ref $form->{$_} } keys %{ $form };
-
- $form->{title} = $locale->text('Delete delivery order');
- $form->header();
+ $form->info($locale->text('Delivery Order deleted!'));
+ $::dispatcher->end_request;
+ }
- print $form->parse_html_template('do/delete', { 'VARIABLES' => \@variables });
+ $form->error($locale->text('Cannot delete delivery order!') . $ret);
$main::lxdebug->leave_sub();
}
-
-sub delete_delivery_order {
+sub delete_transfers {
$main::lxdebug->enter_sub();
- check_do_access();
+ check_do_access_for_edit();
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
+ my $ret;
+
+ die "Invalid form type" unless $form->{type} =~ m/^(sales|purchase)_delivery_order$/;
- if (DO->delete()) {
+ if ($ret = DO->delete_transfers()) {
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|donumber_| . $form->{donumber};
- $form->{addition} = "DELETED";
+ $form->{addition} = "UNDO TRANSFER";
$form->save_history;
}
# /saving the history
- $form->info($locale->text('Delivery Order deleted!'));
- ::end_of_request();
+ flash_later('info', $locale->text("Transfer undone."));
+
+ $form->{callback} = 'do.pl?action=edit&type=' . $form->{type} . '&id=' . $form->escape($form->{id});
+ $form->redirect;
}
- $form->error($locale->text('Cannot delete delivery order!'));
+ $form->error($locale->text('Cannot undo delivery order transfer!') . $ret);
$main::lxdebug->leave_sub();
}
@@ -752,10 +1089,16 @@ 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->get_employee();
+
$form->{convert_from_do_ids} = $form->{id};
- $form->{deliverydate} = $form->{transdate};
+ # if we have a reqdate (Liefertermin), this is definetely the preferred
+ # deliverydate for invoices
+ $form->{deliverydate} = $form->{reqdate} || $form->{transdate};
$form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
$form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
@@ -779,7 +1122,10 @@ sub invoice {
}
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
@@ -788,27 +1134,29 @@ sub invoice {
}
}
}
- 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 $currency = $form->{currency};
- $form->{shipto} = 1 if $form->{convert_from_do_ids};
invoice_links();
if ($form->{ordnumber}) {
require SL::DB::Order;
- if (my $order = SL::DB::Manager::Order->find_by(ordnumber => $form->{ordnumber})) {
+ my $vc_id = $form->{type} =~ /^sales/ ? 'customer_id' : 'vendor_id';
+ if (my $order = SL::DB::Manager::Order->find_by(ordnumber => $form->{ordnumber}, $vc_id => $form->{"$vc_id"})) {
$order->load;
$form->{orddate} = $order->transdate_as_date;
- $form->{$_} = $order->$_ for qw(payment_id salesman_id taxzone_id quonumber);
+ $form->{$_} = $order->$_ for qw(payment_id salesman_id taxzone_id quonumber taxincluded);
+ $form->{taxincluded_changed_by_user} = 1;
}
}
@@ -847,13 +1195,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($_) for 1 .. $form->{rowcount};
-
display_form();
$main::lxdebug->leave_sub();
@@ -872,7 +1213,7 @@ sub invoice_multi {
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 };
@@ -891,6 +1232,8 @@ sub invoice_multi {
# Hinweis: delete gibt den wert zurueck und loescht danach das element (nett und einfach)
# $shell: perldoc perlunc; /delete EXPR
$form->{donumber} = delete $form->{donumber_array};
+ $form->{ordnumber} = delete $form->{ordnumber_array};
+ $form->{cusordnumber} = delete $form->{cusordnumber_array};
$form->{deliverydate} = $form->{transdate};
$form->{transdate} = $form->current_date(\%myconfig);
$form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
@@ -924,7 +1267,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} }) {
@@ -932,6 +1276,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 ...
@@ -946,20 +1291,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();
@@ -968,7 +1306,7 @@ sub invoice_multi {
sub save_as_new {
$main::lxdebug->enter_sub();
- check_do_access();
+ check_do_access_for_edit();
my $form = $main::form;
@@ -977,7 +1315,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;
@@ -991,26 +1329,6 @@ sub save_as_new {
$main::lxdebug->leave_sub();
}
-sub e_mail {
- $main::lxdebug->enter_sub();
-
- check_do_access();
-
- my $form = $main::form;
-
- $form->{print_and_save} = 1;
-
- my $saved_form = save_form();
-
- save();
-
- restore_form($saved_form, 0, qw(id ordnumber quonumber));
-
- edit_e_mail();
-
- $main::lxdebug->leave_sub();
-}
-
sub calculate_stock_in_out {
$main::lxdebug->enter_sub();
@@ -1032,11 +1350,9 @@ sub calculate_stock_in_out {
my $sum = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $sinfo });
my $matches = $do_qty == $sum;
- my $content = $form->format_amount_units('amount' => $sum * 1,
- 'part_unit' => $form->{"partunit_$i"},
- 'amount_unit' => $all_units->{$form->{"partunit_$i"}}->{base_unit},
- 'conv_units' => 'convertible_not_smaller',
- 'max_places' => 2);
+ my $amount_unit = $all_units->{$form->{"partunit_$i"}}->{base_unit};
+ my $content = $form->format_amount(\%::myconfig, AM->convert_unit($amount_unit, $form->{"unit_$i"}) * $sum * 1) . ' ' . $form->{"unit_$i"};
+
$content = qq|${content} |;
$main::lxdebug->leave_sub();
@@ -1106,7 +1422,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);
@@ -1135,12 +1452,16 @@ sub display_stock_in_form {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- $form->{jsscript} = 1;
-
$form->{title} = $locale->text('Stock');
my $part_info = IC->get_basic_part_info('id' => $form->{parts_id});
+ # Standardlagerplatz für Standard-Auslagern verwenden, falls keiner für die Ware explizit definiert wurde
+ if ($::instance_conf->get_transfer_default_use_master_default_bin) {
+ $part_info->{warehouse_id} ||= $::instance_conf->get_warehouse_id;
+ $part_info->{bin_id} ||= $::instance_conf->get_bin_id;
+ }
+
my $units = AM->retrieve_units(\%myconfig, $form);
# der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
my $units_data = AM->unit_select_data($units, $form->{do_unit}, undef, $part_info->{unit});
@@ -1165,11 +1486,8 @@ sub _stock_in_out_set_qty_display {
my $form = $::form;
my $all_units = AM->retrieve_all_units();
my $sum = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info });
- $form->{qty_display} = $form->format_amount_units(amount => $sum * 1,
- part_unit => $form->{partunit},
- amount_unit => $all_units->{ $form->{partunit} }->{base_unit},
- conv_units => 'convertible_not_smaller',
- max_places => 2);
+ my $amount_unit = $all_units->{$form->{"partunit"}}->{base_unit};
+ $form->{qty_display} = $form->format_amount(\%::myconfig, AM->convert_unit($amount_unit, $form->{"do_unit"}) * $sum * 1) . ' ' . $form->{"do_unit"};
}
sub set_stock_in {
@@ -1185,10 +1503,10 @@ 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);
+ $form->{stock} = SL::YAML::Dump($stock_info);
_stock_in_out_set_qty_display($stock_info);
@@ -1223,10 +1541,7 @@ sub stock_out_form {
if (!$form->{delivered}) {
foreach my $row (@contents) {
- $row->{available_qty} = $form->format_amount_units('amount' => $row->{qty} * 1,
- 'part_unit' => $part_info->{unit},
- 'conv_units' => 'convertible_not_smaller',
- 'max_places' => 2);
+ $row->{available_qty} = $form->format_amount(\%::myconfig, $row->{qty} * 1) . ' ' . $part_info->{unit};
foreach my $sinfo (@{ $stock_info }) {
next if (($row->{bin_id} != $sinfo->{bin_id}) ||
@@ -1234,7 +1549,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);
}
}
@@ -1276,13 +1591,14 @@ 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"},
};
}
my @errors = DO->check_stock_availability('requests' => $stock_info,
'parts_id' => $form->{parts_id});
- $form->{stock} = YAML::Dump($stock_info);
+ $form->{stock} = SL::YAML::Dump($stock_info);
if (@errors) {
$form->{ERRORS} = [];
@@ -1312,7 +1628,7 @@ sub transfer_in {
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);
@@ -1337,6 +1653,8 @@ sub transfer_in {
$request->{parts_id} = $form->{"id_$i"};
$row_sum_base_qty += $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
+ $request->{project_id} = $form->{"project_id_$i"} || $form->{globalproject_id};
+
push @all_requests, $request;
}
@@ -1357,7 +1675,7 @@ sub transfer_in {
update();
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
@@ -1366,6 +1684,7 @@ sub transfer_in {
SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
+ flash_later('info', $locale->text("Transfer successful"));
$form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id});
$form->redirect;
@@ -1380,7 +1699,7 @@ sub transfer_out {
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);
@@ -1453,18 +1772,14 @@ sub transfer_out {
$binfo->{bin_description},
$request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
$request->{bestbefore} ? $locale->text('bestbefore #1', $request->{bestbefore}) : $locale->text('no bestbefore'),
- $form->format_amount_units('amount' => $request->{sum_base_qty},
- 'part_unit' => $pinfo->{unit},
- 'conv_units' => 'convertible_not_smaller'));
+ $form->format_amount(\%::myconfig, $request->{sum_base_qty}) . ' ' . $pinfo->{unit});
} else {
push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, for the transfer of #5.",
$pinfo->{description},
$binfo->{warehouse_description},
$binfo->{bin_description},
$request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
- $form->format_amount_units('amount' => $request->{sum_base_qty},
- 'part_unit' => $pinfo->{unit},
- 'conv_units' => 'convertible_not_smaller'));
+ $form->format_amount(\%::myconfig, $request->{sum_base_qty}) . ' ' . $pinfo->{unit});
}
}
}
@@ -1476,7 +1791,7 @@ sub transfer_out {
update();
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
DO->transfer_in_out('direction' => 'out',
@@ -1484,6 +1799,7 @@ sub transfer_out {
SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
+ flash_later('info', $locale->text("Transfer successful"));
$form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id});
$form->redirect;
@@ -1504,6 +1820,27 @@ sub mark_closed {
$main::lxdebug->leave_sub();
}
+sub display_form {
+ $::lxdebug->enter_sub;
+
+ check_do_access();
+
+ 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});
@@ -1521,7 +1858,8 @@ sub dispatcher {
my $form = $main::form;
my $locale = $main::locale;
- foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_in mark_closed save_as_new invoice delete)) {
+ foreach my $action (qw(update print 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);
return;
@@ -1530,3 +1868,251 @@ sub dispatcher {
$form->error($locale->text('No action defined.'));
}
+
+sub transfer_out_default {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ transfer_in_out_default('direction' => 'out');
+
+ $main::lxdebug->leave_sub();
+}
+
+sub transfer_in_default {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ transfer_in_out_default('direction' => 'in');
+
+ $main::lxdebug->leave_sub();
+}
+
+# Falls das Standardlagerverfahren aktiv ist, wird
+# geprüft, ob alle Standardlagerplätze für die Auslager-
+# artikel vorhanden sind UND ob die Warenmenge ausreicht zum
+# Auslagern. Falls nicht wird entsprechend eine Fehlermeldung
+# generiert. Offen Chargennummer / bestbefore wird nicht berücksichtigt
+sub transfer_in_out_default {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my %params = @_;
+
+ my (%missing_default_bins, %qty_parts, @all_requests, %part_info_map, $default_warehouse_id, $default_bin_id);
+
+ Common::check_params(\%params, qw(direction));
+
+ # entsprechende defaults holen, falls standardlagerplatz verwendet werden soll
+ if ($::instance_conf->get_transfer_default_use_master_default_bin) {
+ $default_warehouse_id = $::instance_conf->get_warehouse_id;
+ $default_bin_id = $::instance_conf->get_bin_id;
+ }
+
+
+ my @part_ids = map { $form->{"id_${_}"} } (1 .. $form->{rowcount});
+ if (@part_ids) {
+ my $units = AM->retrieve_units(\%myconfig, $form);
+ %part_info_map = IC->get_basic_part_info('id' => \@part_ids);
+ foreach my $i (1 .. $form->{rowcount}) {
+ 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;
+
+ $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)
+
+ $qty = 0 if (!$::instance_conf->get_transfer_default_services && $part_info_map{$form->{"id_$i"}}->{part_type} eq 'service');
+ $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, ($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' => $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},
+ 'project_id' => $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id}
+ };
+ }
+
+ # jetzt wird erst überprüft, ob die Stückzahl entsprechend stimmt.
+ # 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
+
+ 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
+ # deshalb rückmeldung nach oben geben, manuell auszulagern
+ # TODO Bei nur einem Treffer mit Charge oder bestbefore wäre das noch möglich
+ $missing_default_bins{$key}{chargenumber} = 1;
+ }
+ if ($max_qty < $qty_parts{$key}){
+ $missing_default_bins{$key}{missing_qty} = $max_qty - $qty_parts{$key};
+ }
+ }
+ }
+ } # if @parts_id
+
+ # Abfrage für Fehlerbehandlung (nur bei direction == out)
+ if (scalar (keys %missing_default_bins)) {
+ my $fehlertext;
+ foreach my $fehler (keys %missing_default_bins) {
+
+ my $ware = WH->get_part_description(parts_id => $fehler);
+ if ($missing_default_bins{$fehler}{missing_bin}){
+ $fehlertext .= "Kein Standardlagerplatz definiert bei $ware
";
+ }
+ if ($missing_default_bins{$fehler}{missing_qty}) { # missing_qty
+ $fehlertext .= "Es fehlen " . $missing_default_bins{$fehler}{missing_qty}*-1 .
+ " von $ware auf dem Standard-Lagerplatz " . $part_info_map{$fehler}{bin} . " zum Auslagern
";
+ }
+ if ($missing_default_bins{$fehler}{chargenumber}){
+ $fehlertext .= "Die Ware hat eine Chargennummer oder eine Mindesthaltbarkeit definiert.
+ Hier kann man nicht automatisch entscheiden.
+ Bitte diesen Lieferschein manuell auslagern.
+ Bei: $ware";
+ }
+ # auslagern soll immer gehen, auch wenn nicht genügend auf lager ist.
+ # der lagerplatz ist hier extra konfigurierbar, bspw. Lager-Korrektur mit
+ # Lagerplatz Lagerplatz-Korrektur
+ my $default_warehouse_id_ignore_onhand = $::instance_conf->get_warehouse_id_ignore_onhand;
+ my $default_bin_id_ignore_onhand = $::instance_conf->get_bin_id_ignore_onhand;
+ if ($::instance_conf->get_transfer_default_ignore_onhand && $default_bin_id_ignore_onhand) {
+ # entsprechende defaults holen
+ # falls chargenumber, bestbefore oder anzahl nicht stimmt, auf automatischen
+ # lagerplatz wegbuchen!
+ foreach (@all_requests) {
+ if ($_->{parts_id} eq $fehler){
+ $_->{bin_id} = $default_bin_id_ignore_onhand;
+ $_->{warehouse_id} = $default_warehouse_id_ignore_onhand;
+ }
+ }
+ } else {
+ #$main::lxdebug->message(0, 'Fehlertext: ' . $fehlertext);
+ $form->show_generic_error($locale->text("Cannot transfer.
Reason:
#1", $fehlertext ));
+ }
+ }
+ }
+
+
+ # hier der eigentliche fallunterschied für in oder out
+ my $prefix = $params{direction} eq 'in' ? 'in' : 'out';
+
+ # 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++;
+ next unless scalar(%{ $_ });
+ $form->{"stock_${prefix}_$i"} = SL::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);
+
+ SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
+
+ $form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id}) if $params{direction} eq 'out';
+ $form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id}) if $params{direction} eq 'in';
+ $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)