summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xLedgerSMB/AA.pm1
-rwxr-xr-xLedgerSMB/Form.pm3
-rwxr-xr-xLedgerSMB/IS.pm2
-rwxr-xr-xbin/aa.pl1
-rwxr-xr-xbin/pos.pl8
5 files changed, 10 insertions, 5 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);
diff --git a/bin/aa.pl b/bin/aa.pl
index f1e43e37..3c3f875a 100755
--- a/bin/aa.pl
+++ b/bin/aa.pl
@@ -1220,7 +1220,6 @@ sub search {
sub transactions {
-
if ($form->{$form->{vc}}) {
$form->{$form->{vc}} = $form->unescape($form->{$form->{vc}});
($form->{$form->{vc}}, $form->{"$form->{vc}_id"}) = split(/--/, $form->{$form->{vc}});
diff --git a/bin/pos.pl b/bin/pos.pl
index 9d98304e..f6419458 100755
--- a/bin/pos.pl
+++ b/bin/pos.pl
@@ -123,20 +123,24 @@ sub add {
sub openinvoices {
undef %column_data;
undef %column_heading;
+ $form->{customer} = "";
+ $form->{customer_id} = 0;
+ delete $form->{l_subtotal};
+ delete $form->{subtotal};
$ENV{REMOTE_ADDR} =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/;
$form->{till} = $4;
$form->{sort} = 'transdate';
- for (qw(open l_invnumber l_transdate l_name l_amount l_curr l_till l_subtotal)) { $form->{$_} = 'Y'; }
+ for (qw(open l_invnumber l_transdate l_name l_amount l_curr l_till)) { $form->{$_} = 'Y'; }
if ($myconfig{role} ne 'user') {
$form->{l_employee} = 'Y';
}
$form->{title} = $locale->text('Open');
- transactions;
+ &transactions;
}