speak better perlish for last commit

[mfinanz.git] / bin / mozilla / do.pl

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index b722e20814e5e62a81690f47a3cfa76330e6be8b..c54940826751859527c98309d7370df0748032b4 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -30,6 +30,8 @@
 # Delivery orders
 #======================================================================
 
 # Delivery orders
 #======================================================================
 

+use Carp;
+use List::MoreUtils qw(uniq);

 use List::Util qw(max sum);
 use POSIX qw(strftime);
 use YAML;
 use List::Util qw(max sum);
 use POSIX qw(strftime);
 use YAML;


@@ -38,8 +40,10 @@ use SL::DB::DeliveryOrder;
 use SL::DO;
 use SL::IR;
 use SL::IS;
 use SL::DO;
 use SL::IR;
 use SL::IS;

+use SL::MoreCommon qw(ary_diff);

 use SL::ReportGenerator;
 use SL::WH;
 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/arap.pl";
 require "bin/mozilla/common.pl";
 require "bin/mozilla/invoice_io.pl";


@@ -84,6 +88,10 @@ sub add {
 
   check_do_access();
 
 
   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");
   my $form     = $main::form;
 
   set_headings("add");


@@ -173,7 +181,6 @@ sub order_links {
                'ids' => $form->{id});
 
   $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes delivery_term_id currency));
                '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') {
 
   # get customer / vendor
   if ($form->{vc} eq 'vendor') {


@@ -254,28 +261,37 @@ 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};
 
   $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";
   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",
     );
 
                    "price_factors"  => "ALL_PRICE_FACTORS",
                    "departments"    => "ALL_DEPARTMENTS",
                    "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 => [
+  # 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 ] ]
   ]);
     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      => [
     or => [
       cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
       and      => [


@@ -293,22 +309,24 @@ sub form_header {
   $form->{oldvcname}         =  $form->{"old$form->{vc}"};
   $form->{oldvcname}         =~ s/--.*//;
 
   $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();";
     $dispatch_to_popup .= "document.do.submit();";

-    $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
+  } elsif ($form->{resubmit}) {
+    # emulate click for resubmitting actions
+    $dispatch_to_popup  = "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;

   }
   }

+  $::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 .')';
 
 
   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 .')';
 

+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
+

   $form->header();
   # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
   # und Erweiterung für Bug 1760:
   $form->header();
   # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
   # und Erweiterung für Bug 1760:


@@ -353,6 +371,8 @@ sub update_delivery_order {
 
   set_headings($form->{"id"} ? "edit" : "add");
 
 
   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;
   $form->{update} = 1;
 
   my $payment_id;


@@ -374,7 +394,6 @@ sub update_delivery_order {
   #            Kunde mit Rabatt 20 -> Rabatt 5,5 i.O.
   $form->{payment_id} = $payment_id if $form->{payment_id} eq "";
 
   #            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 "")
   my $i = $form->{rowcount};
 
   if (   ($form->{"partnumber_$i"} eq "")


@@ -404,17 +423,39 @@ sub update_delivery_order {
 
       if ($rows > 1) {
 
 
       if ($rows > 1) {
 

-        select_item(mode => $mode);
+        select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});

         ::end_of_request();
 
       } else {
 
         ::end_of_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};
         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"});
+
+        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->{"qty_$i"}                = $form->format_amount(\%myconfig, $form->{"qty_$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();
       }
 
       display_form();


@@ -453,11 +494,12 @@ sub search {
 
   $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer';
 
 
   $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->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} };
   $form->{title}             = $locale->text('Delivery Orders');
 
   $form->{SHOW_VC_DROP_DOWN} =  $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
   $form->{title}             = $locale->text('Delivery Orders');


@@ -491,11 +533,12 @@ sub orders {
   my @columns = qw(
     ids                     transdate               reqdate
     id                      donumber
   my @columns = qw(
     ids                     transdate               reqdate
     id                      donumber

-    ordnumber               customernumber
+    ordnumber               customernumber          cusordnumber

     name                    employee  salesman
     shipvia                 globalprojectnumber
     transaction_description department
     open                    delivered
     name                    employee  salesman
     shipvia                 globalprojectnumber
     transaction_description department
     open                    delivered

+    insertdate

   );
 
   $form->{l_open}      = $form->{l_closed} = "Y" if ($form->{open}      && $form->{closed});
   );
 
   $form->{l_open}      = $form->{l_closed} = "Y" if ($form->{open}      && $form->{closed});


@@ -508,9 +551,10 @@ sub orders {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;
   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 serialnumber
+  push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber

                                           transaction_description transdatefrom transdateto reqdatefrom reqdateto
                                           transaction_description transdatefrom transdateto reqdatefrom reqdateto

-                                          type vc employee_id salesman_id project_id);
+                                          type vc employee_id salesman_id project_id
+                                          insertdatefrom insertdateto business_id);

 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
 
 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
 


@@ -522,6 +566,7 @@ sub orders {
     'donumber'                => { 'text' => $locale->text('Delivery Order'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'customernumber'          => { 'text' => $locale->text('Customer Number'), },
     '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'), },
     'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
     'employee'                => { 'text' => $locale->text('Employee'), },
     'salesman'                => { 'text' => $locale->text('Salesman'), },


@@ -531,9 +576,10 @@ sub orders {
     'open'                    => { 'text' => $locale->text('Open'), },
     'delivered'               => { 'text' => $locale->text('Delivered'), },
     'department'              => { 'text' => $locale->text('Department'), },
     '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";
   }
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }


@@ -557,6 +603,9 @@ sub orders {
   if ($form->{vendor}) {
     push @options, $locale->text('Vendor') . " : $form->{vendor}";
   }
   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";
   if ($form->{department}) {
     my ($department) = split /--/, $form->{department};
     push @options, $locale->text('Department') . " : $department";


@@ -568,6 +617,10 @@ sub orders {
     push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }
   push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber};
     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->{transaction_description}) {
     push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }


@@ -581,6 +634,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};
   };
     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');
   }
   if ($form->{open}) {
     push @options, $locale->text('Open');
   }


@@ -651,6 +709,8 @@ sub save {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
   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->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
   $form->isblank("transdate", $locale->text('Delivery Order Date missing!'));


@@ -686,8 +746,8 @@ sub save {
 
   $form->{simple_save} = 1;
   if (!$params{no_redirect} && !$form->{print_and_save}) {
 
   $form->{simple_save} = 1;
   if (!$params{no_redirect} && !$form->{print_and_save}) {

-    set_headings("edit");
-    update();
+    delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
+    edit();

     ::end_of_request();
   }
   $main::lxdebug->leave_sub();
     ::end_of_request();
   }
   $main::lxdebug->leave_sub();


@@ -728,6 +788,8 @@ sub invoice {
   my $locale   = $main::locale;
 
   check_do_access();
   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};
   $main::auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');
 
   $form->{convert_from_do_ids} = $form->{id};


@@ -764,19 +826,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);
+    $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
   }
 
   $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};
   $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}) {
   invoice_links();
 
   if ($form->{ordnumber}) {


@@ -823,13 +886,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();
   display_form();
 
   $main::lxdebug->leave_sub();


@@ -867,6 +923,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};
   # 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);
   $form->{deliverydate}        = $form->{transdate};
   $form->{transdate}           = $form->current_date(\%myconfig);
   $form->{duedate}             = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);


@@ -908,6 +966,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);
     $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 ...
 
     if ($vc_discount){ # falls wir einen Lieferanten/Kundenrabatt haben
       # und keinen anderen discount wert an $i ...


@@ -922,20 +981,13 @@ sub invoice_multi {
   }
   delete $form->{form_details};
 
   }
   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();
 
 
   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();
   display_form();
 
   $main::lxdebug->leave_sub();


@@ -953,7 +1005,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->{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;
   # 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;


@@ -972,9 +1024,9 @@ sub e_mail {
 
   check_do_access();
 
 
   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 $saved_form = save_form();
 


@@ -1082,7 +1134,8 @@ sub update_stock_in {
 
   foreach my $i (1..$form->{rowcount}) {
     $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
 
   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);
   }
 
   display_stock_in_form($stock_info);


@@ -1165,7 +1218,7 @@ sub set_stock_in {
 
     next if ($form->{"qty_$i"} <= 0);
 
 
     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} = YAML::Dump($stock_info);


@@ -1214,7 +1267,7 @@ sub stock_out_form {
                  ($row->{chargenumber} ne $sinfo->{chargenumber}) ||
                  ($row->{bestbefore}   ne $sinfo->{bestbefore}));
 
                  ($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);

       }
     }
 
       }
     }
 


@@ -1256,6 +1309,7 @@ sub set_stock_out {
       'qty'          => $form->{"qty_$i"},
       'unit'         => $form->{"unit_$i"},
       'row'          => $i,
       'qty'          => $form->{"qty_$i"},
       'unit'         => $form->{"unit_$i"},
       'row'          => $i,

+      'delivery_order_items_stock_id'  => $form->{"delivery_order_items_stock_id_$i"},

     };
   }
 
     };
   }
 


@@ -1317,6 +1371,8 @@ sub transfer_in {
         $request->{parts_id}  = $form->{"id_$i"};
         $row_sum_base_qty    += $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
 
         $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;
       }
 
         push @all_requests, $request;
       }
 


@@ -1501,7 +1557,7 @@ sub dispatcher {
   my $form     = $main::form;
   my $locale   = $main::locale;
 
   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);
                          transfer_in transfer_in_default mark_closed save_as_new invoice delete)) {
     if ($form->{"action_${action}"}) {
       call_sub($action);


@@ -1564,20 +1620,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;
       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;
 
 
       $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"},
                         '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},
                         'unit' => $part_info_map{$form->{"id_$i"}}{unit},
                         'warehouse_id' => $part_info_map{$form->{"id_$i"}}{warehouse_id},
                         'oe_id' => $form->{id},


@@ -1586,12 +1651,13 @@ sub transfer_in_out_default {
     }
 
     # jetzt wird erst überprüft, ob die Stückzahl entsprechend stimmt.
     }
 
     # 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
         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


@@ -1654,14 +1720,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.
   # 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){
   foreach (@all_requests){

-    $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]);

     $i++;
     $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
   }
 
   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);
 
   DO->transfer_in_out('direction' => $prefix,
                       'requests'  => \@all_requests);
 


@@ -1672,3 +1749,59 @@ sub transfer_in_out_default {
   $form->redirect;
 
 }
   $form->redirect;
 
 }

+
+sub sort {
+  $main::lxdebug->enter_sub();
+
+  check_do_access();
+
+  my $form     = $main::form;
+  my %temp_hash;
+
+  croak ("Delivery Order needs to be saved") unless $form->{id};
+
+  # 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"} };
+  }
+  # 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++;
+  }
+    $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)