Anzahlungs-Rg.: Workflow -> Schluss-Rg.: sellprice wirklich aus fxsellprice

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 2fd82c7b8754fe3161731b64fb94fc8ddb379a4c..e05f57cd1af3b3078fd49ef891414835d0c9d0b7 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -95,6 +95,9 @@ sub add {
   } elsif ($form->{type} eq "invoice_for_advance_payment") {
     $form->{title} = $locale->text('Add Invoice for Advance Payment');
 
   } elsif ($form->{type} eq "invoice_for_advance_payment") {
     $form->{title} = $locale->text('Add Invoice for Advance Payment');
 

+  } elsif ($form->{type} eq "final_invoice") {
+    $form->{title} = $locale->text('Final Invoice');
+

   } else {
     $form->{title} = $locale->text('Add Sales Invoice');
 
   } else {
     $form->{title} = $locale->text('Add Sales Invoice');
 


@@ -143,6 +146,9 @@ sub edit {
     $form->{title} = $locale->text('Edit Invoice for Advance Payment');
     $form->{title} = $locale->text('Edit Storno Invoice for Advance Payment') if $form->{storno};
 
     $form->{title} = $locale->text('Edit Invoice for Advance Payment');
     $form->{title} = $locale->text('Edit Storno Invoice for Advance Payment') if $form->{storno};
 

+  } elsif ($form->{type} eq "final_invoice") {
+    $form->{title} = $locale->text('Edit Final Invoice');
+

   } else {
     $form->{title} = $locale->text('Edit Sales Invoice');
     $form->{title} = $locale->text('Edit Storno Invoice')     if $form->{storno};
   } else {
     $form->{title} = $locale->text('Edit Sales Invoice');
     $form->{title} = $locale->text('Edit Storno Invoice')     if $form->{storno};


@@ -253,6 +259,10 @@ sub prepare_invoice {
     $form->{type}     = "invoice_for_advance_payment";
     $form->{formname} = "invoice_for_advance_payment";
 
     $form->{type}     = "invoice_for_advance_payment";
     $form->{formname} = "invoice_for_advance_payment";
 

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

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


@@ -1024,6 +1034,12 @@ sub post {
 
   $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
     if ($form->{currency} ne $form->{defaultcurrency});
 
   $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
     if ($form->{currency} ne $form->{defaultcurrency});

+  # advance payment allows only one tax
+  if ($form->{type} eq 'invoice_for_advance_payment') {
+    my @current_taxaccounts = (split(/ /, $form->{taxaccounts}));
+    $form->error($locale->text('Cannot post invoice for advance payment with more than one tax'))
+      if (scalar @current_taxaccounts > 1);
+  }

 
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
 
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {


@@ -1208,7 +1224,7 @@ sub final_invoice {
 
   $form->{convert_from_ar_ids} = $form->{id};
   $form->{id}                  = '';
 
   $form->{convert_from_ar_ids} = $form->{id};
   $form->{id}                  = '';

-  $form->{type}                = 'invoice';
+  $form->{type}                = 'final_invoice';

   $form->{title}               = t8('Edit Final Invoice');
   $form->{paidaccounts}        = 1;
   $form->{invdate}             = $form->current_date(\%myconfig);
   $form->{title}               = t8('Edit Final Invoice');
   $form->{paidaccounts}        = 1;
   $form->{invdate}             = $form->current_date(\%myconfig);


@@ -1236,7 +1252,7 @@ sub final_invoice {
       $form->{"partnumber_$i"} = $item->part->partnumber;
       $form->{"discount_$i"}   = $item->discount*100.0;
       $form->{"sellprice_$i"}  = $item->fxsellprice;
       $form->{"partnumber_$i"} = $item->part->partnumber;
       $form->{"discount_$i"}   = $item->discount*100.0;
       $form->{"sellprice_$i"}  = $item->fxsellprice;

-      $form->{$_ . "_" . $i}   = $item->$_       for qw(description longdescription qty price_factor_id unit sellprice active_price_source active_discount_source);
+      $form->{$_ . "_" . $i}   = $item->$_       for qw(description longdescription qty price_factor_id unit active_price_source active_discount_source);

 
       $form->{$_ . "_" . $i}   = $form->format_amount(\%myconfig, $form->{$_ . "_" . $i}) for qw(qty sellprice discount);
     }
 
       $form->{$_ . "_" . $i}   = $form->format_amount(\%myconfig, $form->{$_ . "_" . $i}) for qw(qty sellprice discount);
     }