Fill 'open_item_id' in 'acc_trans' table for ar/ap items

Author: ehuelsmann

old/lib/LedgerSMB/AA.pm

@@ -302,11 +302,11 @@ sub post_transaction {
         $sth = $dbh->prepare($query);
         $sth->execute( $form->{employee_id}, $form->{"$form->{vc}_id"}) || $form->dberror($query);
 
-        $query = qq|SELECT id FROM $table WHERE invnumber = '$uid'|;
+        $query = qq|SELECT id, open_item_id FROM $table WHERE invnumber = '$uid'|;
         $sth   = $dbh->prepare($query);
         $sth->execute || $form->dberror($query);
 
-        ( $form->{id} ) = $sth->fetchrow_array;
+        ( $form->{id}, $form->{open_item_id} ) = $sth->fetchrow_array;
 
         $query = <<~'SQL';
            UPDATE transactions
@@ -511,13 +511,13 @@ sub post_transaction {
         ($accno) = split /--/, $form->{$ARAP};
         $query = qq|
             INSERT INTO acc_trans
-                     (trans_id, chart_id, amount_bc, curr, amount_tc,
-                      transdate, approved)
+                     (trans_id, chart_id, open_item_id,
+                      amount_bc, curr, amount_tc, transdate, approved)
               VALUES (?, (SELECT id FROM account
-                              WHERE accno = ?),
+                              WHERE accno = ?), ?,
                            ?, ?, ?, ?, ?)|;
         @queryargs =
-            ( $form->{id}, $accno,
+            ( $form->{id}, $accno, $form->{open_item_id},
               $invamount * -1 * $ml, $form->{currency},
               $invamount * -1 * $ml / $form->{exchangerate},
               $form->{transdate},

old/lib/LedgerSMB/Form.pm

@@ -1992,7 +1992,7 @@ sub create_links {
                 txn.approved, ctf.default_reportable,
                 txn.description, a.on_hold, a.crdate,
                 a.shipto as shiptolocationid, a.shipto_attn as shiptoattn,
-                a.is_return, $seq,
+                a.is_return, $seq, a.open_item_id,
                 t.workflow_id, t.reversing, t.reversing_reference,
                 t.reversed_by, t.reversed_by_reference
             FROM $arap a

old/lib/LedgerSMB/IR.pm

@@ -150,11 +150,11 @@ sub post_invoice {
         $sth = $dbh->prepare($query);
         $sth->execute( $form->{employee_id}, $form->{vendor_id}) || $form->dberror($query);
 
-        $query = qq|SELECT id FROM ap WHERE invnumber = '$uid'|;
+        $query = qq|SELECT id, open_item_id FROM ap WHERE invnumber = '$uid'|;
         $sth   = $dbh->prepare($query);
         $sth->execute || $form->dberror($query);
 
-        ( $form->{id} ) = $sth->fetchrow_array;
+        ( $form->{id}, $form->{open_item_id} ) = $sth->fetchrow_array;
 
         $query = q|UPDATE transactions SET workflow_id = ?, reversing = ? WHERE id = ? AND workflow_id IS NULL|;
         $sth   = $dbh->prepare($query);
@@ -466,13 +466,13 @@ sub post_invoice {
         ($accno) = split /--/, $form->{AP};
 
         $query = qq|
-          INSERT INTO acc_trans (trans_id, chart_id,
+          INSERT INTO acc_trans (trans_id, chart_id, open_item_id,
                                 amount_bc, curr, amount_tc, transdate, approved)
-                       VALUES (?, (SELECT id FROM account WHERE accno = ?),
+                       VALUES (?, (SELECT id FROM account WHERE accno = ?), ?,
                               ?, ?, ?, ?, ?)|;
         $sth = $dbh->prepare($query)
             or $form->dberror($dbh->errstr);
-         $sth->execute( $form->{id}, $accno,
+        $sth->execute( $form->{id}, $accno, $form->{open_item_id},
                        $form->{payables}, $form->{currency},
                     $form->{payables}/$form->{exchangerate},
                        $form->{transdate}, $approved)

old/lib/LedgerSMB/IS.pm

@@ -805,11 +805,11 @@ sub post_invoice {
         $sth = $dbh->prepare($query);
         $sth->execute( $form->{employee_id}, $form->{customer_id}) || $form->dberror($query);
 
-        $query = qq|SELECT id FROM ar WHERE invnumber = '$uid'|;
+        $query = qq|SELECT id, open_item_id FROM ar WHERE invnumber = '$uid'|;
         $sth   = $dbh->prepare($query);
         $sth->execute || $form->dberror($query);
 
-        ( $form->{id} ) = $sth->fetchrow_array;
+        ( $form->{id}, $form->{open_item_id} ) = $sth->fetchrow_array;
 
         $query = q|UPDATE transactions SET workflow_id = ?, reversing = ? WHERE id = ? AND workflow_id IS NULL|;
         $sth   = $dbh->prepare($query);
@@ -1149,14 +1149,14 @@ sub post_invoice {
 
         $query = qq|
             INSERT INTO acc_trans
-                     (trans_id, chart_id,
+                     (trans_id, chart_id, open_item_id,
                       amount_bc, curr, amount_tc, transdate, approved)
-                 VALUES (?, (SELECT id FROM account WHERE accno = ?),
+                 VALUES (?, (SELECT id FROM account WHERE accno = ?), ?,
                      ?, ?, ?, ?, ?)|;
 
         $sth = $dbh->prepare($query)
             or $form->dberror($dbh->errstr);
-        $sth->execute( $form->{id}, $accno,
+        $sth->execute( $form->{id}, $accno, $form->{open_item_id},
                        $form->{receivables}, $form->{currency},
                $form->{receivables} / $form->{exchangerate},
                        $transdate, $approved)