diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-07-18 19:46:07 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-07-18 19:46:07 +0000 |
| commit | accf1eeac6040c6b47155532ac0a1bb096013591 (patch) | |
| tree | a141731b7128a57f0bfdb2586499d6796e965e4e /LedgerSMB/IS.pm | |
| parent | 0d48810d44ef1c0d37585d4b636847c5e825df26 (diff) | |
Applying Victor's patch for invoice reversals
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1423 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'LedgerSMB/IS.pm')
| -rw-r--r-- | LedgerSMB/IS.pm | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/LedgerSMB/IS.pm b/LedgerSMB/IS.pm index 724dc4f2..d4cfd5be 100644 --- a/LedgerSMB/IS.pm +++ b/LedgerSMB/IS.pm @@ -1053,9 +1053,29 @@ sub post_invoice { $form->{"qty_$i"} * -1 ) unless $form->{shipped}; if($form->{"qty_$i"} > 0){ - $allocated = - &cogs( $dbh, $form, $form->{"id_$i"}, $form->{"qty_$i"}, - $project_id ); + #start patch bug 1755355 + # check for unallocated entries at the same price to match our entry + $query = qq| + SELECT i.id, i.qty, i.allocated, a.transdate + FROM invoice i + 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( $form->{"id_$i"}, $form->{"sellprice_$i"}) || $form->dberror($query); + my $totalqty = $form->{"qty_$i"}; + while ( my $ref = $sth->fetchrow_hashref(NAME_lc) ) { + $form->db_parse_numeric(sth=>$sth, hashref => $ref); + my $qty = $ref->{qty} + $ref->{allocated}; + if ( ( $qty + $totalqty ) < 0 ) { $qty = -$totalqty; } + # update allocated for sold item + $form->update_balance( $dbh, "invoice", "allocated", qq|id = $ref->{id}|, (-1)*$qty); + $allocated += $qty; + last if ( ( $totalqty += $qty ) <= 0 ); + } + $allocated += &cogs( $dbh, $form, $form->{"id_$i"}, $totalqty, $project_id ); + #stop patch bug 1755355 } else { $query = qq| |