Kosmetik

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

diff --git a/SL/IR.pm b/SL/IR.pm
index 12add2af13ef867415b17d3498df6b600050d056..690c20d8412364994ba15235dc7b4937294ff429 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -553,6 +553,7 @@ sub post_invoice {
                 curr = ?,
                 department_id = ?,
                 storno = ?,
                 curr = ?,
                 department_id = ?,
                 storno = ?,

+                storno_id = ?,

                 globalproject_id = ?,
                 cp_id = ?,
                 employee_id = ?
                 globalproject_id = ?,
                 cp_id = ?,
                 employee_id = ?


@@ -564,7 +565,7 @@ sub post_invoice {
              conv_date($form->{duedate}), $taxzone_id,
              $form->{taxincluded} ? 't' : 'f',
              $form->{notes}, $form->{intnotes}, $form->{currency}, conv_i($form->{department_id}),
              conv_date($form->{duedate}), $taxzone_id,
              $form->{taxincluded} ? 't' : 'f',
              $form->{notes}, $form->{intnotes}, $form->{currency}, conv_i($form->{department_id}),

-             $form->{storno} ? 't' : 'f',
+             $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}),

              conv_i($form->{globalproject_id}), conv_i($form->{cp_id}),
              conv_i($form->{employee_id}),
              conv_i($form->{id}));
              conv_i($form->{globalproject_id}), conv_i($form->{cp_id}),
              conv_i($form->{employee_id}),
              conv_i($form->{id}));


@@ -725,11 +726,11 @@ sub retrieve_invoice {
   my ($query, $sth, $ref, $q_invdate);
 
   if (!$form->{id}) {
   my ($query, $sth, $ref, $q_invdate);
 
   if (!$form->{id}) {

-    $q_invdate = qq|, COALESCE((SELECT MAX(transdate) FROM ar), current_date) AS invdate|;
+    $q_invdate = qq|, COALESCE((SELECT transdate FROM ar WHERE id = (SELECT MAX(id) FROM ar)), current_date) AS invdate|;

     if ($form->{vendor_id}) {
       my $vendor_id = $dbh->quote($form->{vendor_id} * 1);
       $q_invdate .=
     if ($form->{vendor_id}) {
       my $vendor_id = $dbh->quote($form->{vendor_id} * 1);
       $q_invdate .=

-        qq|, COALESCE((SELECT MAX(transdate) FROM ar), current_date) +
+        qq|, COALESCE((SELECT transdate FROM ar WHERE id = (SELECT MAX(id) FROM ar)), current_date) +

              COALESCE((SELECT pt.terms_netto
                        FROM vendor v
                        LEFT JOIN payment_terms pt ON (v.payment_id = pt.id)
              COALESCE((SELECT pt.terms_netto
                        FROM vendor v
                        LEFT JOIN payment_terms pt ON (v.payment_id = pt.id)