Proformarechnung geht bei Drucken und Buchen verloren

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 2f1f9b73577873ce06804cc09353b56a6b5a0625..5ac59b27e74b3256af2536d0ac94d7cd41171c93 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -45,11 +45,12 @@ use English qw(-no_match_vars);
 
 use SL::DB::Default;
 use SL::DB::Customer;
 
 use SL::DB::Default;
 use SL::DB::Customer;

+use SL::DB::Department;

 use SL::DB::Invoice;
 use SL::DB::PaymentTerm;
 
 use SL::DB::Invoice;
 use SL::DB::PaymentTerm;
 

+require "bin/mozilla/common.pl";

 require "bin/mozilla/io.pl";
 require "bin/mozilla/io.pl";

-require "bin/mozilla/arap.pl";

 
 use strict;
 
 
 use strict;
 


@@ -213,6 +214,8 @@ sub prepare_invoice {
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
     $form->{formname} = "credit_note";
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
     $form->{formname} = "credit_note";

+  } elsif ($form->{formname} eq "proforma" ) {
+    $form->{type}     = "invoice";

   } else {
     $form->{type}     = "invoice";
     $form->{formname} = "invoice";
   } else {
     $form->{type}     = "invoice";
     $form->{formname} = "invoice";


@@ -274,7 +277,7 @@ sub form_header {
                    "currencies"    => "ALL_CURRENCIES",
                    "price_factors" => "ALL_PRICE_FACTORS");
 
                    "currencies"    => "ALL_CURRENCIES",
                    "price_factors" => "ALL_PRICE_FACTORS");
 

-  $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+  $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;

 
   # Projects
   my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
 
   # Projects
   my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});


@@ -309,7 +312,6 @@ sub form_header {
       ]
     ]
   ]);
       ]
     ]
   ]);

-  $TMPL_VAR{department_labels}     = sub { "$_[0]->{description}--$_[0]->{id}" };

 
   # currencies and exchangerate
   my @values = map { $_       } @{ $form->{ALL_CURRENCIES} };
 
   # currencies and exchangerate
   my @values = map { $_       } @{ $form->{ALL_CURRENCIES} };


@@ -841,9 +843,8 @@ sub post {
   if (!$form->{no_redirect_after_post}) {
     $form->{action} = 'edit';
     $form->{script} = 'is.pl';
   if (!$form->{no_redirect_after_post}) {
     $form->{action} = 'edit';
     $form->{script} = 'is.pl';

-    $form->{saved_message} = $form->{label} . " $form->{invnumber} " . $locale->text('posted!');

     $form->{callback} = build_std_url(qw(action edit id callback saved_message));
     $form->{callback} = build_std_url(qw(action edit id callback saved_message));

-    $form->redirect;
+    $form->redirect($form->{label} . " $form->{invnumber} " . $locale->text('posted!'));

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