diff options
| -rwxr-xr-x | LedgerSMB/AA.pm | 4 | ||||
| -rwxr-xr-x | LedgerSMB/CP.pm | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm index e9d8c938..fcf5782a 100755 --- a/LedgerSMB/AA.pm +++ b/LedgerSMB/AA.pm @@ -346,10 +346,10 @@ sub post_transaction { transdate, fx_transaction) VALUES (?, (SELECT id FROM chart WHERE accno = ?), - ? * ?, ?, ?)|; + ?, ?, ?)|; @queryargs = ($form->{id}, $ref->{accno}, - $ref->{amount}, $ml, $form->{transdate}, + $ref->{amount} * $ml, $form->{transdate}, $ref->{fx_transaction}); $dbh->prepare($query)->execute(@queryargs) || $form->dberror($query); diff --git a/LedgerSMB/CP.pm b/LedgerSMB/CP.pm index 33d47bcf..edb474ed 100755 --- a/LedgerSMB/CP.pm +++ b/LedgerSMB/CP.pm @@ -419,10 +419,10 @@ sub post_payment { amount) VALUES (?, ?, ?, - ? * ?)|; + ?)|; $sth = $dbh->prepare($query); $sth->execute($form->{"id_$i"}, $id, - $form->{date_paid}, $amount, $ml) + $form->{date_paid}, $amount * $ml) || $form->dberror($query, 'CP.pm', 427); # add payment @@ -433,11 +433,12 @@ sub post_payment { VALUES (?, (SELECT id FROM chart WHERE accno = ?), - ?, ? * ? * -1, ?, ?)|; + ?, ?, ?, ?)|; $sth = $dbh->prepare($query); $sth->execute( $form->{"id_$i"}, $paymentaccno, - $form->{datepaid}, $form->{"paid_$i"}, $ml, + $form->{datepaid}, + $form->{"paid_$i"} * $ml * -1, $form->{source}, $form->{memo}) || $form->dberror( $query, 'CP.pm', 444); @@ -458,12 +459,12 @@ sub post_payment { VALUES (?, (SELECT id FROM chart WHERE accno = ?), - ?, ? * ? * -1, '0', '1', + ?, ?, '0', '1', ?)|; $sth = $dbh->prepare($query); $sth->execute( $form->{"id_$i"}, $paymentaccno, - $form->{datepaid}, $amount, $ml, + $form->{datepaid}, $amount * $ml * -1, $form->{source}) || $form->dberror( $query, 'CP.pm', 470); @@ -693,12 +694,12 @@ sub post_payments { INSERT INTO acc_trans (trans_id, chart_id, transdate, amount) - VALUES (?, ?, ?, ? * ?)|; + VALUES (?, ?, ?, ?)|; $sth = $dbh->prepare($query); $sth->execute( $form->{"id_$i"}, $id, $form->{datepaid}, - $amount, $ml) + $amount * $ml) || $form->dberror($query, 'CP.pm', 701); @@ -715,12 +716,13 @@ sub post_payments { INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, source, memo) - VALUES (?, ?, ?, ? * ? * -1, ?, ?)|; + VALUES (?, ?, ?, ?, ?, ?)|; $sth = $dbh->prepare($query); $sth->execute( $form->{"id_$i"}, $accno_id, $form->{datepaid}, - $paid, $ml, $form->{source}, $form->{memo}) + $paid * $ml * -1, $form->{source}, + $form->{memo}) || $form->dberror($query, 'CP.pm', 723); |