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

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

Revision: 4794
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4794&view=rev
Author:   daintree
Date:     2012-01-09 05:20:15 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Paul Harness corrections to petty cash scripts

Modified Paths:
--------------
    trunk/PcAuthorizeExpenses.php
    trunk/PcClaimExpensesFromTab.php
    trunk/doc/Change.log

Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php	2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcAuthorizeExpenses.php	2012-01-09 05:20:15 UTC (rev 4794)
@@ -253,8 +253,8 @@
 		if (isset($_POST[$myrow['counterindex']])){
 			echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
 		}else{
-			$Authoriser=ConvertSQLDate($myrow['authorized']);
-			if(($Authoriser!='00/00/0000')){
+			//compare against raw SQL format date, then convert for display.
+			if(($myrow['authorized']!='0000-00-00')){
 				echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
 			}else{
 				echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'" /></td>';

Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php	2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcClaimExpensesFromTab.php	2012-01-09 05:20:15 UTC (rev 4794)
@@ -327,7 +327,7 @@
 		}//end of Get Edit
 
 		if (!isset($_POST['Date'])) {
-			$_POST['Date']=Date('d/m/Y');
+			$_POST['Date']=Date($_SESSION['DefaultDateFormat']);
 		}
 
 		echo '<tr><td>' . _('Date Of Expense') . ':</td>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/doc/Change.log	2012-01-09 05:20:15 UTC (rev 4794)
@@ -1,5 +1,8 @@
 webERP Change Log
 
+8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
+8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
+8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
 7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
 7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
 5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.

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