summaryrefslogtreecommitdiff
path: root/LedgerSMB
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-10-18 00:45:37 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-10-18 00:45:37 +0000
commit59a9c930a875cc618b7386314bcfc69adc4fe549 (patch)
tree5cd55697cc97b255cf3d24df431d49a9cdcc3471 /LedgerSMB
parente20e7a6e47760d0e8561ae7d13a29ddc24330b68 (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/trunk@1782 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'LedgerSMB')
-rw-r--r--LedgerSMB/IS.pm7
-rw-r--r--LedgerSMB/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 b3b54fca..fdb22861 100644
--- a/LedgerSMB/IS.pm
+++ b/LedgerSMB/IS.pm
@@ -916,6 +916,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"} );
@@ -1138,7 +1143,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 e3517044..4eae7823 100644
--- 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 98694774..bfc0b9fc 100755
--- a/LedgerSMB/Session/DB.pm
+++ b/LedgerSMB/Session/DB.pm
@@ -266,7 +266,6 @@ sub password_check {
$fetchPassword->fetchrow_array;
if ( $dbusername ne $username ) {
-
# User data retrieved from db not for the requested user
return 0;
}