X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/049677eb435b63595b0ffb748f26618fc7f6f479..ed9b1bfb7ca6acf18d907a7d34ddd3a82061b8cb:/bin/mozilla/gl.pl

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index ef7352d2f..5e9d2208a 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -49,7 +49,8 @@ use SL::DBUtils qw(selectrow_query selectall_hashref_query);
 use SL::Webdav;
 use SL::Locale::String qw(t8);
 use SL::Helper::GlAttachments qw(count_gl_attachments);
-use Carp;
+use SL::Presenter::Tag;
+use SL::Presenter::Chart;
 require "bin/mozilla/common.pl";
 require "bin/mozilla/reportgenerator.pl";
 
@@ -95,7 +96,7 @@ sub load_record_template {
 
   $template->substitute_variables;
   my $payment_suggestion =  $::form->{form_defaults}->{amount_1};
-  # croak ("hier" . $payment_suggestion);
+
   # Clean the current $::form before rebuilding it from the template.
   my $form_defaults = delete $::form->{form_defaults};
   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
@@ -110,7 +111,7 @@ sub load_record_template {
   $::form->{duedate}          = $today->to_kivitendo;
   $::form->{rowcount}         = @{ $template->items };
   $::form->{paidaccounts}     = 1;
-  $::form->{$_}               = $template->$_     for qw(department_id taxincluded ob_transaction cb_transaction reference description);
+  $::form->{$_}               = $template->$_     for qw(department_id taxincluded ob_transaction cb_transaction reference description show_details);
   $::form->{$_}               = $dummy_form->{$_} for qw(closedto revtrans previous_id previous_gldate);
 
   my $row = 0;
@@ -184,6 +185,7 @@ sub save_record_template {
     cb_transaction => $::form->{cb_transaction}  ? 1 : 0,
     reference      => $::form->{reference},
     description    => $::form->{description},
+    show_details   => $::form->{show_details},
 
     items          => \@items,
   );
@@ -224,7 +226,7 @@ sub add {
   $form->{credit} = 0;
   $form->{tax}    = 0;
 
-  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
 
   $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
 
@@ -245,7 +247,7 @@ sub prepare_transaction {
 
   $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
 
-  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
 
   my $i        = 1;
   my $tax      = 0;
@@ -336,7 +338,7 @@ sub search {
     projects  => { key => "ALL_PROJECTS", all => 1 },
   );
   $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
-  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
 
   setup_gl_search_action_bar();
 
@@ -423,7 +425,7 @@ sub generate_report {
   );
 
   # add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
-  my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal);
+  my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal department_id);
   push @hidden_variables, map { "l_${_}" } @columns;
 
   my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
@@ -836,8 +838,8 @@ sub display_rows {
     my $selected_taxchart = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
 
     my $accno = qq|<td>| .
-      $::request->presenter->chart_picker("accno_id_$i", $accno_id, style => "width: 300px") .
-      $::request->presenter->hidden_tag("previous_accno_id_$i", $accno_id)
+      SL::Presenter::Chart::picker("accno_id_$i", $accno_id, style => "width: 300px") .
+      SL::Presenter::Tag::hidden_tag("previous_accno_id_$i", $accno_id)
       . qq|</td>|;
     my $tax_ddbox = qq|<td>| .
       NTI($cgi->popup_menu('-name' => "taxchart_$i",
@@ -1085,7 +1087,7 @@ sub form_header {
 
   # we cannot book on charttype header
   @{ $::form->{ALL_CHARTS} } = grep { $_->{charttype} ne 'H' }  @{ $::form->{ALL_CHARTS} };
-  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
 
   my $title      = $::form->{title};
   $::form->{title} = $::locale->text("$title General Ledger Transaction");
@@ -1327,7 +1329,35 @@ sub post_transaction {
   }
   # /saving the history
 
-  if ($form->{callback} =~ /BankTransaction/) {
+  # called from BankTransaction - Assign RecordLink and update BankTransaction
+  if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
+    # set invoice_amount - we only rely on bt_id in form, do all other stuff ui independent
+    # die if we have a unlogic or NYI case and (TODO) chain this transaction safe (post_transaction + history_erp + this)
+    my ($bt, $chart_id, $payment);
+
+    $bt = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
+    die "No bank transaction found" unless $bt;
+
+    $chart_id = SL::DB::Manager::BankAccount->find_by(id => $bt->local_bank_account_id)->chart_id;
+    die "no chart id:" unless $chart_id;
+
+    $payment = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $::form->{id},
+                                                                   chart_link => { like => '%AR_paid%' },
+                                                                   chart_id => $chart_id                  ]);
+    die "guru meditation error: Can only assign amount to one bank account booking" if scalar @{ $payment } > 1;
+
+    # credit/debit * -1 matches the sign for bt.amount and bt.invoice_amount
+    $bt->update_attributes(invoice_amount => $bt->invoice_amount + ($payment->[0]->amount * -1));
+
+    # create record_link
+    my @props = (
+      from_table => 'bank_transactions',
+      from_id    => $::form->{bt_id},
+      to_table   => 'gl',
+      to_id      => $::form->{id},
+    );
+    SL::DB::RecordLink->new(@props)->save;
+
     print $form->redirect_header($form->{callback});
     $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
   }