X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=8f42a067b7d48b73a3420dc453bdfe86e068f5d3;hb=9be50d3a150fde70377e0f10bc25d10cd155557b;hp=beea5ea9f232e434af32e70fbedbe1b6ddeaf13f;hpb=3c416dd9b0473132c9b27380f146aed9d2c8d781;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index beea5ea9f..8f42a067b 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -45,9 +45,10 @@ use SL::PE;
 use SL::ReportGenerator;
 use List::MoreUtils qw(any none);
 use List::Util qw(min max reduce sum);
-use SL::DBUtils;
 use Data::Dumper;
 
+use SL::DB::Customer;
+
 require "bin/mozilla/io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/reportgenerator.pl";
@@ -228,8 +229,7 @@ sub order_links {
   $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;
+  $form->{webdav}   = $::instance_conf->get_webdav;
 
   my $editing = $form->{id};
 
@@ -317,9 +317,6 @@ 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};
 
-  # use JavaScript Calendar or not
-  $form->{jsscript} = 1;
-
   # openclosed checkboxes
   my @tmp;
   push @tmp, sprintf qq|<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" %s><label for="delivered">%s</label>|,
@@ -435,8 +432,6 @@ sub form_header {
   $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
   $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
 
-  $::request->layout->use_stylesheet('presenter/record/record_list.css');
-
   $form->header;
 
   $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
@@ -482,17 +477,9 @@ sub form_footer {
   $TMPL_VAR{notes}    = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
   $TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
 
-  if ( $form->{type} =~ /sales_(order|quotation)/ && $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
-    my $query = '
-      SELECT
-        taxincluded_checked
-      FROM
-        customer
-      WHERE
-        id = ?';
-    my $res = selectfirst_hashref_query($::form, $::form->get_standard_dbh(), $query, conv_i($::form->{customer_id}));
-
-    $form->{taxincluded} = ($res && defined($res->{taxincluded_checked})) ? $res->{taxincluded_checked} : $myconfig{taxincluded_checked};
+  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
+    my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
   }
 
   if (!$form->{taxincluded}) {
@@ -537,7 +524,7 @@ sub form_footer {
 
   print $form->parse_html_template("oe/form_footer", {
      %TMPL_VAR,
-     webdav          => $::lx_office_conf{features}->{webdav},
+     webdav          => $::instance_conf->get_webdav,
      print_options   => print_options(inline => 1),
      label_edit      => $locale->text("Edit the $form->{type}"),
      label_workflow  => $locale->text("Workflow $form->{type}"),
@@ -610,7 +597,11 @@ sub update {
     $form->{"lastcost_$i"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$i"});
 
     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) {
 
@@ -734,7 +725,6 @@ sub search {
   $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
 
   # constants and subs for template
-  $form->{jsscript}        = 1;
   $form->{vc_keys}         = sub { "$_[0]->{name}--$_[0]->{id}" };
 
   $form->header();
@@ -1218,6 +1208,7 @@ sub save {
 
   }
 
+  # value of $ordnumber is ordnumber or quonumber
   $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
     unless $form->{$ordnumber};
 
@@ -1227,7 +1218,12 @@ sub save {
 
   # saving the history
   if(!exists $form->{addition}) {
-    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+    if ( $form->{formname} eq 'sales_quotation' or  $form->{formname} eq 'request_quotation' ) {
+        $form->{snumbers} = qq|quonumber_| . $form->{quonumber};
+    } elsif ( $form->{formname} eq 'sales_order' or $form->{formname} eq 'purchase_order') {
+        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+    };
+    $form->{what_done} = $form->{formname};
     $form->{addition} = "SAVED";
     $form->save_history;
   }
@@ -1243,31 +1239,6 @@ sub save {
 }
 
 sub delete {
-  $::lxdebug->enter_sub;
-
-  check_oe_access();
-
-  $::form->header;
-
-  # delete action variable
-  delete $::form->{$_} for qw(action header);
-
-  my @hiddens;
-  for my $key (keys %$::form) {
-    next if $key eq 'login' || $key eq 'password' || '' ne ref $::form->{$key};
-    push @hiddens, { key => $key, value => $::form->{$key} };
-  }
-
-  print $::form->parse_html_template('oe/delete', {
-    hiddens => \@hiddens,
-    is_order => scalar($::form->{type} =~ /_order$/),
-  });
-
-
-  $::lxdebug->leave_sub;
-}
-
-sub delete_order_quotation {
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;