projects / kivitendo-erp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Prozentangaben in der Steuerbeschreibung wieder hinzugefuegt
[kivitendo-erp.git] / bin / mozilla / io.pl
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 820ad48..adb78ed 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -134,7 +134,7 @@ sub display_row {
   my $colspan = $#column_index + 1;
 
   $form->{invsubtotal} = 0;
-  map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
+  map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
 
 ########################################
   # Eintrag fuer Version 2.2.0 geaendert #
@@ -242,6 +242,13 @@ sub display_row {
     $delvar       = 'reqdate';
   }
 
+  my %projectnumber_labels = ();
+  my @projectnumber_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@projectnumber_values, $item->{"id"});
+    $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
   for $i (1 .. $numrows) {
 
     # undo formatting
@@ -486,11 +493,12 @@ sub display_row {
           <b>$serialnumber</b>&nbsp;<input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}">|;
     }
 
-    print qq|
-          <b>$projectnumber</b>&nbsp;<input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}">
-                 <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}">
-                 <input type=hidden name="project_id_$i" value="$form->{"project_id_$i"}">
-|;
+    print qq|<b>$projectnumber</b>&nbsp;| .
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@projectnumber_values,
+                           '-labels' => \%projectnumber_labels,
+                           '-default' => $form->{"project_id_$i"}));
+
     if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
       my $reqdate_term =
         ($form->{type} eq 'invoice')
@@ -511,7 +519,7 @@ sub display_row {
 ############## ENDE Neueintrag ##################
 
     map { $form->{"${_}_base"} += $linetotal }
-      (split / /, $form->{"taxaccounts_$i"});
+      (split(/ /, $form->{"taxaccounts_$i"}));
 
     $form->{invsubtotal} += $linetotal;
   }
@@ -667,9 +675,10 @@ sub select_item {
 <input name="new_taxaccounts_$i" type=hidden value="$ref->{taxaccounts}">
 <input name="new_partsgroup_$i" type=hidden value="$ref->{partsgroup}">
 <input name="new_formel_$i" type=hidden value="$ref->{formel}">
-<input name="new_longdescription_$i" type=hidden value="$ref->{longdescription}">
+<input name="new_longdescription_$i" type=hidden value="| . Q($ref->{longdescription}) . qq|">
 <input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
 <input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
+<input name="new_partnotes_$i" type="hidden" value="| . Q($ref->{"partnotes"}) . qq|">
 
 <input name="new_id_$i" type=hidden value=$ref->{id}>
 
@@ -732,7 +741,9 @@ sub item_selected {
   $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
   map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
-    qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
+    qw(id partnumber description sellprice listprice inventory_accno
+       income_accno expense_accno bin unit weight assembly taxaccounts
+       partsgroup formel longdescription not_discountable partnotes);
   if ($form->{"part_payment_id_$i"} ne "") {
     $form->{payment_id} = $form->{"part_payment_id_$i"};
   }
@@ -878,6 +889,9 @@ sub display_form {
 
   relink_accounts();
 
+  my $new_rowcount = $form->{"rowcount"} * 1 + 1;
+  $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"};
+
   $form->language_payment(\%myconfig);
 
   # if we have a display_form
@@ -886,6 +900,8 @@ sub display_form {
     exit;
   }
 
+  Common::webdav_folder($form) if ($webdav);
+
   #   if (   $form->{print_and_post}
   #       && $form->{second_run}
   #       && ($form->{action} eq "display_form")) {
@@ -1112,12 +1128,12 @@ sub invoicetotal {
 
     $amount = $sellprice * (1 - $discount / 100) * $qty;
     map { $form->{"${_}_base"} += $amount }
-      (split / /, $form->{"taxaccounts_$i"});
+      (split (/ /, $form->{"taxaccounts_$i"}));
     $form->{oldinvtotal} += $amount;
   }
 
   map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
-    split / /, $form->{taxaccounts}
+    split(/ /, $form->{taxaccounts})
     if !$form->{taxincluded};
 
   $form->{oldtotalpaid} = 0;
@@ -1177,6 +1193,10 @@ sub order {
   $form->{cp_id} *= 1;
 
   require "$form->{path}/$form->{script}";
+  my $script = $form->{"script"};
+  $script =~ s|.*/||;
+  $script =~ s|.pl$||;
+  $locale = new Locale($language, $script);
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -1322,7 +1342,7 @@ sub e_mail {
   my $attachment_filename = $formname_translations{$form->{"formname"}};
   my $prefix;
 
-  if ($form->{"type"} =~ /invoice/) {
+  if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
     $prefix = "inv";
   } elsif ($form->{"type"} =~ /_quotation$/) {
     $prefix = "quo";
@@ -1474,8 +1494,6 @@ sub print_options {
     $myconfig{"default_media"} ? $myconfig{"default_media"} :
     "screen";
 
-  $lxdebug->message(0, "fm $form->{media}");
-
   $form->{"printer_id"} =
     defined($form->{"printer_id"}) ? $form->{"printer_id"} :
     $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
@@ -1542,20 +1560,6 @@ sub print_options {
       . $locale->text('Credit Note');
   }
 
-  if ($form->{type} eq 'ship_order') {
-    $type = qq|<select name=formname>
-           <option value=pick_list $form->{PD}{pick_list}>|
-      . $locale->text('Pick List') . qq|
-           <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
-
-  if ($form->{type} eq 'receive_order') {
-    $type = qq|<select name=formname>
-           <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
   if ($form->{media} eq 'email') {
     $media = qq|<select name=sendmode>
            <option value=attachment $form->{SM}{attachment}>|
@@ -1757,8 +1761,7 @@ sub print_form {
   if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
     $inv                  = "inv";
     $due                  = "due";
-    $form->{"${inv}date"} = $form->{transdate};
-    $form->{"invdate"}    = $form->{transdate};
+    $form->{"${inv}date"} = $form->{invdate};
     $form->{label}        = $locale->text('Proforma Invoice');
     $numberfld            = "sonumber";
     $order                = 0;
@@ -1822,7 +1825,7 @@ sub print_form {
     $inv                  = "quo";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{"invdate"} = $form->{transdate};
+    $form->{"invdate"}    = $form->{transdate};
     $form->{label}        = $locale->text('Proforma Invoice');
     $numberfld            = "sqnumber";
     $order                = 1;
@@ -1840,7 +1843,9 @@ sub print_form {
   $form->isblank("email", $locale->text('E-mail address missing!'))
     if ($form->{media} eq 'email');
   $form->isblank("${inv}date",
-                 $locale->text($form->{label} . ' Date missing!'));
+           $locale->text($form->{label}) 
+           . ": "
+           . $locale->text(' Date missing!'));
 
   # $locale->text('Invoice Number missing!')
   # $locale->text('Invoice Date missing!')
@@ -1852,6 +1857,7 @@ sub print_form {
   # $locale->text('Quotation Date missing!')
 
   # assign number
+  $form->{what_done} = $form->{formname};
   if (!$form->{"${inv}number"} && !$form->{preview}) {
     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
     if ($form->{media} ne 'email') {
@@ -1865,6 +1871,12 @@ sub print_form {
       $form->{rowcount}--;
 
       &{"$display_form"};
+      # saving the history
+         if(!exists $form->{addition}) {
+           $form->{addition} = "PRINTED";
+           $form->save_history($form->dbconnect(\%myconfig));
+      }
+      # /saving the history
       exit;
     }
   }
@@ -1898,7 +1910,6 @@ sub print_form {
   }
 
   ($form->{employee}) = split /--/, $form->{employee};
-  ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
 
   # create the form variables
   if ($order) {
@@ -2041,6 +2052,24 @@ sub print_form {
   }
   $queued = $form->{queued};
 
+# saving the history
+  if(!exists $form->{addition}) {
+    if($form->{media} =~ /printer/) {
+       $form->{addition} = "PRINTED";
+    }
+    elsif($form->{media} =~ /email/) {
+       $form->{addition} = "MAILED";
+    }
+    elsif($form->{media} =~ /queue/) {
+       $form->{addition} = "QUEUED";
+    }
+    elsif($form->{media} =~ /screen/) {
+       $form->{addition} = "SCREENED";
+    }
+    $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
+
   $form->parse_template(\%myconfig, $userspath);
 
   $form->{callback} = "";
@@ -2328,7 +2357,6 @@ sub relink_accounts {
   $lxdebug->leave_sub();
 }
 
-
 sub set_duedate {
   $lxdebug->enter_sub();
 
Unnamed repository; edit this file 'description' to name the repository.