diff options
| -rwxr-xr-x | LedgerSMB/IR.pm | 16 | ||||
| -rwxr-xr-x | LedgerSMB/IS.pm | 10 |
2 files changed, 18 insertions, 8 deletions
diff --git a/LedgerSMB/IR.pm b/LedgerSMB/IR.pm index 9c6839d3..69b20aea 100755 --- a/LedgerSMB/IR.pm +++ b/LedgerSMB/IR.pm @@ -40,6 +40,9 @@ use Math::BigFloat; sub post_invoice { my ( $self, $myconfig, $form ) = @_; + if ($form->{id}){ + delete_invoice($self, $myconfig, $form); + } my $dbh = $form->{dbh}; $form->{invnumber} = $form->update_defaults( $myconfig, "vinumber", $dbh ) unless $form->{invnumber}; @@ -923,6 +926,7 @@ sub reverse_invoice { sub delete_invoice { my ( $self, $myconfig, $form ) = @_; + # connect to database my $dbh = $form->{dbh}; @@ -949,10 +953,6 @@ sub delete_invoice { &reverse_invoice( $dbh, $form ); - # delete AP record - $query = qq|DELETE FROM ap WHERE id = ?|; - my $sth = $dbh->prepare($query); - $sth->execute( $form->{id} ) || $form->dberror($query); # delete spool files $query = qq| @@ -991,7 +991,13 @@ sub delete_invoice { if $spoolfile; } } - + $query = "DELETE FROM invoice WHERE trans_id = ?"; + $sth = $dbh->prepare($query); + $sth->execute($form->{id}); + # delete AP record + $query = qq|DELETE FROM ap WHERE id = ?|; + my $sth = $dbh->prepare($query); + $sth->execute( $form->{id} ) || $form->dberror($query); my $rc = $dbh->commit; $rc; diff --git a/LedgerSMB/IS.pm b/LedgerSMB/IS.pm index 89b3ba3d..5cc991c6 100755 --- a/LedgerSMB/IS.pm +++ b/LedgerSMB/IS.pm @@ -1594,6 +1594,11 @@ sub cogs { # If there are unallocated items for the current invoice at the end, we # will throw an error until we have an understanding of other workflows # that need to be supported. -- CT + # + # Note: Victor's original patch selected items to reverse based on + # sell price. This causes issues with restocking fees and the like so + # I am removing that restriction. This should be discussed more fully + # however. -- CT $query = qq| SELECT i.id, i.qty, i.allocated, a.transdate, -1 * (i.allocated + i.qty) AS available, @@ -1602,11 +1607,10 @@ sub cogs { JOIN parts p ON (p.id = i.parts_id) JOIN ar a ON (a.id = i.trans_id) WHERE i.parts_id = ? AND (i.qty + i.allocated) > 0 - AND i.sellprice = ? ORDER BY transdate |; $sth = $dbh->prepare($query); - $sth->execute($id, $sellprice) || $form->dberror($query); + $sth->execute($id) || $form->dberror($query); my $qty; while ( my $ref = $sth->fetchrow_hashref(NAME_lc) ) { $form->db_parse_numeric(sth=>$sth, hashref => $ref); @@ -1645,7 +1649,7 @@ sub cogs { FROM invoice i JOIN parts p ON (i.parts_id = p.id) JOIN ap a ON (i.trans_id = a.id) - WHERE (i.allocated + i.qty) < 0 + WHERE allocated > 0 AND i.parts_id = ? ORDER BY a.transdate DESC, a.id DESC |; |