Leerzeichen am Ende bei curr(ency) entfernen.

[kivitendo-erp.git] / SL / IR.pm

diff --git a/SL/IR.pm b/SL/IR.pm
index 0fe1987..2bb56a7 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -106,7 +106,7 @@ sub post_invoice {
     if ( $::instance_conf->get_inventory_system eq 'periodic') {
       # inventory account number is overwritten with expense account number, so
       # never book incoming to inventory account but always to expense account
-      $form->{"inventory_accno_$i"} = $form->{"expense_accno_$i"} 
+      $form->{"inventory_accno_$i"} = $form->{"expense_accno_$i"}
     };
 
     # get item baseunit
@@ -226,14 +226,14 @@ sub post_invoice {
            # ORDER BY transdate guarantees FIFO
 
 # sold two items without having bought them yet, example result of query:
-# id | qty | allocated | trans_id | inventory_accno_id | expense_accno_id | transdate  
+# id | qty | allocated | trans_id | inventory_accno_id | expense_accno_id | transdate
 # ---+-----+-----------+----------+--------------------+------------------+------------
 #  9 |   2 |         0 |        9 |                 15 |              151 | 2011-01-05
 
 # base_qty + allocated > 0 if article has already been sold but not bought yet
 
 # select qty,allocated,base_qty,sellprice from invoice where trans_id = 9;
-#  qty | allocated | base_qty | sellprice  
+#  qty | allocated | base_qty | sellprice
 # -----+-----------+----------+------------
 #    2 |         0 |        2 | 1000.00000
 
@@ -499,6 +499,12 @@ sub post_invoice {
 
   # record payments and offsetting AP
   for my $i (1 .. $form->{paidaccounts}) {
+    if ($form->{"acc_trans_id_$i"}
+        && $payments_only
+        && ($::lx_office_conf{features}->{payments_changeable} == 0)) {
+      next;
+    }
+
     next if $form->{"paid_$i"} == 0;
 
     my ($accno)            = split /--/, $form->{"AP_paid_$i"};
@@ -518,11 +524,14 @@ sub post_invoice {
     }
 
     # record payment
-    $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, taxkey, project_id)
-                VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?,
+    my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
+
+    $query =
+      qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, taxkey, project_id)
+                VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?,
                 (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
     @values = (conv_i($form->{id}), $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"},
-               $form->{"source_$i"}, $form->{"memo_$i"}, $accno, $project_id);
+               $gldate, $form->{"source_$i"}, $form->{"memo_$i"}, $accno, $project_id);
     do_query($form, $dbh, $query, @values);
 
     $exchangerate = 0;
@@ -844,6 +853,9 @@ sub retrieve_invoice {
   $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
+  # remove any trailing whitespace
+  $form->{currency} =~ s/\s*$//;
+
   $form->{exchangerate}  = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
 
   # get shipto
@@ -1093,9 +1105,10 @@ sub retrieve_item {
       push @values, $form->{"partnumber_$i"};
    }
 
+  # Search for part ID overrides all other criteria.
   if ($form->{"id_${i}"}) {
-    $where .= qq| AND p.id = ?|;
-    push @values, $form->{"id_${i}"};
+    $where  = qq|p.id = ?|;
+    @values = ($form->{"id_${i}"});
   }
 
   if ($form->{"description_$i"}) {
@@ -1393,10 +1406,12 @@ sub post_payment {
   $old_form = save_form();
 
   # Delete all entries in acc_trans from prior payments.
-  $self->_delete_payments($form, $dbh);
+  if ($::lx_office_conf{features}->{payments_changeable} != 0) {
+    $self->_delete_payments($form, $dbh);
+  }
 
   # Save the new payments the user made before cleaning up $form.
-  map { $payments{$_} = $form->{$_} } grep m/^datepaid_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^AP_paid_\d+$|^paidaccounts$/, keys %{ $form };
+  map { $payments{$_} = $form->{$_} } grep m/^datepaid_\d+$|^gldate_\d+$|^acc_trans_id_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^AP_paid_\d+$|^paidaccounts$/, keys %{ $form };
 
   # Clean up $form so that old content won't tamper the results.
   %keep_vars = map { $_, 1 } qw(login password id);