SF.net SVN: ledger-smb: [1018] branches/1.2

[..hidden..]

Revision: 1018
          http://svn.sourceforge.net/ledger-smb/?rev=1018&view=rev
Author:   einhverfr
Date:     2007-03-30 14:54:02 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Fixing POS open transaction report, and catching error if FXRate is not entered

Modified Paths:
--------------
    branches/1.2/LedgerSMB/AA.pm
    branches/1.2/LedgerSMB/Form.pm
    branches/1.2/LedgerSMB/IS.pm
    branches/1.2/bin/aa.pl
    branches/1.2/bin/pos.pl

Modified: branches/1.2/LedgerSMB/AA.pm
===================================================================
--- branches/1.2/LedgerSMB/AA.pm	2007-03-30 18:16:41 UTC (rev 1017)
+++ branches/1.2/LedgerSMB/AA.pm	2007-03-30 21:54:02 UTC (rev 1018)
@@ -837,7 +837,6 @@
 
 	$query .= "WHERE $where
 			ORDER BY $sortorder";
-
 	my $sth = $dbh->prepare($query);
 	$sth->execute(@paidargs) || $form->dberror($query);
 

Modified: branches/1.2/LedgerSMB/Form.pm
===================================================================
--- branches/1.2/LedgerSMB/Form.pm	2007-03-30 18:16:41 UTC (rev 1017)
+++ branches/1.2/LedgerSMB/Form.pm	2007-03-30 21:54:02 UTC (rev 1018)
@@ -1579,6 +1579,9 @@
 		@queryargs = ($sell);
 	}
 
+	if (!$set){
+		$self->error("Exchange rate missing!");
+	}
 	if ($sth->fetchrow_array) {
 		$query = qq|UPDATE exchangerate
 					   SET $set

Modified: branches/1.2/LedgerSMB/IS.pm
===================================================================
--- branches/1.2/LedgerSMB/IS.pm	2007-03-30 18:16:41 UTC (rev 1017)
+++ branches/1.2/LedgerSMB/IS.pm	2007-03-30 21:54:02 UTC (rev 1018)
@@ -1412,7 +1412,7 @@
 		$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);
 

Modified: branches/1.2/bin/aa.pl
===================================================================
--- branches/1.2/bin/aa.pl	2007-03-30 18:16:41 UTC (rev 1017)
+++ branches/1.2/bin/aa.pl	2007-03-30 21:54:02 UTC (rev 1018)
@@ -1220,7 +1220,6 @@
 
 
 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}});

Modified: branches/1.2/bin/pos.pl
===================================================================
--- branches/1.2/bin/pos.pl	2007-03-30 18:16:41 UTC (rev 1017)
+++ branches/1.2/bin/pos.pl	2007-03-30 21:54:02 UTC (rev 1018)
@@ -123,20 +123,24 @@
 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;
   
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.