SEPA reference nach SEPA-Standard zulässigen Wert (140) erhöht

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

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index e08c4355dbeb52420c9001e104074b03f0781290..d6e162ed808f2805bdccbf41d189af463c5f91b4 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -24,7 +24,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.

 #======================================================================
 #
 # Inventory received module
 #======================================================================
 #
 # Inventory received module


@@ -34,7 +35,6 @@
 use SL::FU;
 use SL::IR;
 use SL::IS;
 use SL::FU;
 use SL::IR;
 use SL::IS;

-use SL::PE;

 use SL::DB::Default;
 use SL::DB::PurchaseInvoice;
 use List::Util qw(max sum);
 use SL::DB::Default;
 use SL::DB::PurchaseInvoice;
 use List::Util qw(max sum);


@@ -334,7 +334,7 @@ sub form_header {
     max_dunning_level dunning_amount
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
     max_dunning_level dunning_amount
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus

-    convert_from_do_ids convert_from_oe_ids show_details gldate useasnew
+    convert_from_do_ids convert_from_oe_ids convert_from_ap_ids show_details gldate useasnew

   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 


@@ -406,7 +406,7 @@ sub form_footer {
 
   # follow ups
   if ($form->{id}) {
 
   # follow ups
   if ($form->{id}) {

-    $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];
+    $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1) || [];

     $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
   }
 
     $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
   }
 


@@ -626,7 +626,8 @@ sub storno {
   $form->{paidaccounts} = 0;
   map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ gldate_ acc_trans_id_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };
   # set new ids for storno invoice
   $form->{paidaccounts} = 0;
   map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ gldate_ acc_trans_id_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };
   # set new ids for storno invoice

-  delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
+  # set new persistent ids for storno invoice items
+  $form->{"converted_from_invoice_id_$_"} = delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};

 
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
 
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {


@@ -637,6 +638,8 @@ sub storno {
   }
   # /saving the history
 
   }
   # /saving the history
 

+  # record link invoice to storno
+  $form->{convert_from_ap_ids} = $form->{id};

   $form->{storno_id} = $form->{id};
   $form->{storno} = 1;
   $form->{id} = "";
   $form->{storno_id} = $form->{id};
   $form->{storno} = 1;
   $form->{id} = "";