[Web-erp-svn] SF.net SVN: web-erp:[6571] trunk

[<dai...@us...>]

Revision: 6571
          http://sourceforge.net/p/web-erp/reponame/6571
Author:   daintree
Date:     2014-02-12 05:43:11 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
Andrew Galuski: WOSerialNos fix for quantity number format error;

Modified Paths:
--------------
    trunk/GLTrialBalance_csv.php
    trunk/WOSerialNos.php
    trunk/doc/Change.log
    trunk/locale/en_US.utf8/LC_MESSAGES/messages.po

Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php	2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/GLTrialBalance_csv.php	2014-02-12 05:43:11 UTC (rev 6571)
@@ -10,10 +10,11 @@
  * also need to work on authentication with username and password sent too*/
 
 
-$AllowAnyone =true;
+$AllowAnyone = true;
 
 //Page must be called with GLTrialBalance_csv.php?CompanyName=XXXXX&FromPeriod=Y&ToPeriod=Z
 $_POST['CompanyNameField'] = $_GET['CompanyName'];
+$_SESSION['DatabaseName'] =  $_GET['CompanyName'];
 //htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') = dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8')) .'/GLTrialBalance_csv.php?ToPeriod=' . $_GET['ToPeriod'] . '&FromPeriod=' . $_GET['FromPeriod'];
 
 include ('includes/session.inc');
@@ -79,4 +80,4 @@
 }
 echo $CSV_File;
 
-?>
\ No newline at end of file
+?>

Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php	2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/WOSerialNos.php	2014-02-12 05:43:11 UTC (rev 6571)
@@ -184,7 +184,7 @@
 				prnMsg($_POST['OldReference' .$i] . ': ' , _('The new batch or serial number reference has not been entered - a reference is required'),'error');
 				$InputError=true;
 			}
-			if (!is_numeric($_POST['Quantity' . $i])){
+			if (!is_numeric(filter_number_format($_POST['Quantity' . $i]))){
 				prnMsg(_('The quantity for the batch must be numeric'),'error');
 				$InputError=true;
 			}

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/doc/Change.log	2014-02-12 05:43:11 UTC (rev 6571)
@@ -1,5 +1,9 @@
 webERP Change Log
-14/2/2014 Exson: Fixed the Earliest date calculation when is over Friday cutoff Time in DateFunctions.inc.
+
+12/2/14 Andrew Galuski: WOSerialNos.php - added filter number format on quantity
+12/2/14 Exson: Fixed the Earliest date calculation when is over Friday cutoff Time in DateFunctions.inc.
+
+
 8/2/14 Release 4.11.3
 
 8/2/14 Phil: prevented GL posting to control accounts from Payments.php and CustomerReceipts.php where the configuration option to stop postings to these accounts is set.

Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po	2014-02-12 03:05:07 UTC (rev 6570)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po	2014-02-12 05:43:11 UTC (rev 6571)
@@ -1876,7 +1876,7 @@
 
 #: BankMatching.php:280 Payments.php:1080
 msgid "Cheque No"
-msgstr ""
+msgstr "Check No"
 
 #: BankMatching.php:281 ShipmentCosting.php:537 ShipmentCosting.php:614
 #: SupplierAllocations.php:457
@@ -2009,11 +2009,11 @@
 
 #: BankReconciliation.php:209
 msgid "The unpresented cheques could not be retrieved by the SQL because"
-msgstr ""
+msgstr "The unpresented checks could not be retrieved by the SQL because"
 
 #: BankReconciliation.php:213
 msgid "Add back unpresented cheques"
-msgstr ""
+msgstr "Add back unpresented checks"
 
 #: BankReconciliation.php:219 BankReconciliation.php:296
 #: CustomerAllocations.php:349 CustomerAllocations.php:379
@@ -2058,7 +2058,7 @@
 
 #: BankReconciliation.php:268
 msgid "Total of all unpresented cheques"
-msgstr ""
+msgstr "Total of all unpresented checks"
 
 #: BankReconciliation.php:287
 msgid "The uncleared deposits could not be retrieved by the SQL because"
@@ -16992,7 +16992,7 @@
 
 #: Payments.php:23
 msgid "Payment Cancelled since cheque was not printed"
-msgstr ""
+msgstr "Payment Cancelled since check was not printed"
 
 #: Payments.php:47
 msgid "A bank account must be selected to make this payment from"
@@ -17040,11 +17040,11 @@
 
 #: Payments.php:300
 msgid "Print Cheque using pre-printed stationery"
-msgstr ""
+msgstr "Print Check using pre-printed stationery"
 
 #: Payments.php:307
 msgid "Has the cheque been printed"
-msgstr ""
+msgstr "Has the check been printed"
 
 #: Payments.php:312
 msgid "Yes / Continue"
@@ -17131,7 +17131,7 @@
 
 #: Payments.php:649
 msgid "The Cheque/Voucher number has already been used"
-msgstr ""
+msgstr "The Check/Voucher number has already been used"
 
 #: Payments.php:649 Payments.php:679
 msgid "This GL analysis item could not be added"
@@ -17139,7 +17139,7 @@
 
 #: Payments.php:679
 msgid "The cheque number has already been used"
-msgstr ""
+msgstr "The check number has already been used"
 
 #: Payments.php:731
 msgid "SQL used to retrieve the bank account name was"
@@ -17197,7 +17197,7 @@
 
 #: Payments.php:913
 msgid "Cheque Number"
-msgstr ""
+msgstr "Check Number"
 
 #: Payments.php:914
 msgid "(if using pre-printed stationery)"
@@ -17235,7 +17235,7 @@
 
 #: Payments.php:1042
 msgid "Cheque/Voucher Number"
-msgstr ""
+msgstr "Check/Voucher Number"
 
 #: Payments.php:1104
 msgid "Are you sure you wish to delete this payment analysis item?"
@@ -18087,11 +18087,11 @@
 
 #: PDFChequeListing.php:40
 msgid "Enter the date from which cheques are to be listed"
-msgstr ""
+msgstr "Enter the date from which checks are to be listed"
 
 #: PDFChequeListing.php:43
 msgid "Enter the date to which cheques are to be listed"
-msgstr ""
+msgstr "Enter the date to which checks are to be listed"
 
 #: PDFChequeListing.php:62 PDFDeliveryDifferences.php:73 PDFDIFOT.php:77
 msgid "Email the report off"
@@ -18112,11 +18112,11 @@
 
 #: PDFChequeListing.php:126
 msgid "Cheque Listing"
-msgstr ""
+msgstr "Check Listing"
 
 #: PDFChequeListing.php:127
 msgid "Cheque listing from"
-msgstr ""
+msgstr "Check listing from"
 
 #: PDFChequeListing.php:151
 msgid "An error occurred getting the GL transactions"
@@ -18124,7 +18124,7 @@
 
 #: PDFChequeListing.php:184
 msgid "CHEQUES"
-msgstr ""
+msgstr "CHECKS"
 
 #: PDFChequeListing.php:195
 msgid "Payments check list"
@@ -21190,7 +21190,7 @@
 
 #: PrintCheque.php:18 PrintCheque.php:19
 msgid "Print Cheque"
-msgstr ""
+msgstr "Print Check"
 
 #: PrintCheque.php:32
 msgid "Can not get hundreds name"
@@ -21206,7 +21206,7 @@
 
 #: PrintCheque.php:82 PrintCheque.php:96
 msgid "Cheque No."
-msgstr ""
+msgstr "Check No."
 
 #: PrintCheque.php:113
 msgid "Number is out of the range of numbers that can be expressed in words"
@@ -21242,7 +21242,7 @@
 
 #: PrintCheque.php:144
 msgid "four"
-msgstr "four"
+msgstr ""
 
 #: PrintCheque.php:145
 msgid "five"
@@ -36869,7 +36869,7 @@
 
 #: Z_ImportGLTransactions.php:184
 msgid "Cheque"
-msgstr ""
+msgstr "Check"
 
 #: Z_ImportGLTransactions.php:203
 msgid "The total of the transactions must balance back to zero"
@@ -40411,7 +40411,7 @@
 
 #: includes/MainMenuLinksArray.php:349
 msgid "Cheque Payments Listing"
-msgstr ""
+msgstr "Check Payments Listing"
 
 #: includes/MainMenuLinksArray.php:350
 msgid "Daily Bank Transactions"