summaryrefslogtreecommitdiff
path: root/LedgerSMB
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-10-18 00:38:57 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-10-18 00:38:57 +0000
commit9d7d99054d518b37ff727920bfcd2087e6b62a69 (patch)
treeef381cae3a86c700ffa6cc41b25ef93496a2cbb9 /LedgerSMB
parent61a59a6f49b9535ec65295893791d4007c3c9bf4 (diff)
POS Fixes:
1: Drawer opening now uses correct printer designation 2: Change issued is now entered with correct memo field. 3: Closing tell report works as advertised git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1779 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'LedgerSMB')
-rwxr-xr-xLedgerSMB/IS.pm7
-rwxr-xr-xLedgerSMB/RC.pm4
-rwxr-xr-xLedgerSMB/Session/DB.pm1
3 files changed, 8 insertions, 4 deletions
diff --git a/LedgerSMB/IS.pm b/LedgerSMB/IS.pm
index 5cc991c6..034835ff 100755
--- a/LedgerSMB/IS.pm
+++ b/LedgerSMB/IS.pm
@@ -913,6 +913,11 @@ sub post_invoice {
my $ml;
my $invoice_id;
my $ndx;
+ for (keys %$form) {
+ if (UNIVERSAL::isa( $form->{$_}, 'Math::BigFloat' )){
+ $form->{$_} = $form->{$_}->bstr();
+ }
+ }
foreach $i ( 1 .. $form->{rowcount} ) {
$form->{"qty_$i"} = $form->parse_amount( $myconfig, $form->{"qty_$i"} );
@@ -1115,7 +1120,7 @@ sub post_invoice {
$form->{paid} = 0;
for $i ( 1 .. $form->{paidaccounts} ) {
$form->{"paid_$i"} =
- $form->parse_amount( $myconfig, $form->{"paid_$i"} );
+ $form->parse_amount( $myconfig, $form->{"paid_$i"} )->bstr();
$form->{paid} += $form->{"paid_$i"};
$form->{datepaid} = $form->{"datepaid_$i"}
if ( $form->{"paid_$i"} );
diff --git a/LedgerSMB/RC.pm b/LedgerSMB/RC.pm
index 6ffc16bf..63558b49 100755
--- a/LedgerSMB/RC.pm
+++ b/LedgerSMB/RC.pm
@@ -45,11 +45,11 @@ sub getposlines {
my $dbh = $form->{dbh};
my $query = qq|
- SELECT sum(amount) AS amount, source FROM acc_trans
+ SELECT sum(amount) AS amount, memo FROM acc_trans
WHERE chart_id = (SELECT id FROM chart
WHERE accno = ?)
AND transdate = date 'NOW' AND cleared IS NOT TRUE
- GROUP BY source|;
+ GROUP BY memo|;
my $sth = $dbh->prepare($query);
$sth->execute( $pos_config{till_accno} ) || $form->dberror($query);
while ( my $ref = $sth->fetchrow_hashref(NAME_lc) ) {
diff --git a/LedgerSMB/Session/DB.pm b/LedgerSMB/Session/DB.pm
index 9b682e8a..c595a1c0 100755
--- a/LedgerSMB/Session/DB.pm
+++ b/LedgerSMB/Session/DB.pm
@@ -254,7 +254,6 @@ sub password_check {
my ( $dbusername, $md5Password, $cryptPassword ) =
$fetchPassword->fetchrow_array;
if ( $dbusername ne $username ) {
-
# User data retrieved from db not for the requested user
return 0;
}