summaryrefslogtreecommitdiff
path: root/LedgerSMB
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-03-30 21:54:02 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-03-30 21:54:02 +0000
commit007780f7a885664171371e138296efc40311a770 (patch)
tree69ba50901a06d91d97d83b5d85540fd59f496cd4 /LedgerSMB
parent286bf08d34745c5afb95add35c102dc966a36fc8 (diff)
Fixing POS open transaction report, and catching error if FXRate is not entered
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1018 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'LedgerSMB')
-rwxr-xr-xLedgerSMB/AA.pm1
-rwxr-xr-xLedgerSMB/Form.pm3
-rwxr-xr-xLedgerSMB/IS.pm2
3 files changed, 4 insertions, 2 deletions
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index b4311eae..dc6f6279 100755
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -837,7 +837,6 @@ sub transactions {
$query .= "WHERE $where
ORDER BY $sortorder";
-
my $sth = $dbh->prepare($query);
$sth->execute(@paidargs) || $form->dberror($query);
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index a7fa9186..352b0ba0 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -1579,6 +1579,9 @@ sub update_exchangerate {
@queryargs = ($sell);
}
+ if (!$set){
+ $self->error("Exchange rate missing!");
+ }
if ($sth->fetchrow_array) {
$query = qq|UPDATE exchangerate
SET $set
diff --git a/LedgerSMB/IS.pm b/LedgerSMB/IS.pm
index 2796d5ba..f67fc5e5 100755
--- a/LedgerSMB/IS.pm
+++ b/LedgerSMB/IS.pm
@@ -1412,7 +1412,7 @@ sub post_invoice {
$form->{duedate}, $form->{shippingpoint}, $form->{shipvia},
$form->{terms}, $form->{notes}, $form->{intnotes},
$form->{taxincluded}, $form->{currency}, $form->{department_id},
- $form->{employee_id}, $till, $form->{language_code},
+ $form->{employee_id}, $form->{till}, $form->{language_code},
$form->{ponumber}, $form->{id})
|| $form->dberror($query);