web-erp-svn

[Web-erp-svn] SF.net SVN: web-erp:[6596] trunk/CustomerAllocations.php

[<ex...@us...>]

Revision: 6596
          http://sourceforge.net/p/web-erp/reponame/6596
Author:   exsonqu
Date:     2014-03-03 02:32:31 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
03/03/2014 Exson: Remove redundant code in CustomerAllocations.php

Modified Paths:
--------------
    trunk/CustomerAllocations.php

Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php	2014-03-03 01:55:46 UTC (rev 6595)
+++ trunk/CustomerAllocations.php	2014-03-03 02:32:31 UTC (rev 6596)
@@ -20,8 +20,6 @@
 include('includes/SQL_CommonFunctions.inc');
 
 if ( isset($_POST['Cancel']) ) {
-	unset($_POST['UpdateDatabase']);
-	unset($_POST['RefreshAllocTotal']);
 	unset($_POST['AllocTrans']);
 }
 
@@ -631,4 +629,4 @@
 
 include('includes/footer.inc');
 
-?>
\ No newline at end of file
+?>

[Web-erp-svn] SF.net SVN: web-erp:[6827] trunk/CustomerAllocations.php

[<rc...@us...>]

Revision: 6827
          http://sourceforge.net/p/web-erp/reponame/6827
Author:   rchacon
Date:     2014-08-18 12:51:11 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
Fixing incompatibility between includes/DefineCustAllocsClass.php and includes/session.inc (temp).

Modified Paths:
--------------
    trunk/CustomerAllocations.php

Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php	2014-08-17 21:53:13 UTC (rev 6826)
+++ trunk/CustomerAllocations.php	2014-08-18 12:51:11 UTC (rev 6827)
@@ -7,13 +7,14 @@
 	3. No parameters to show all outstanding credits and receipts yet to be allocated.
 */
 
+include('includes/DefineCustAllocsClass.php');// Before includes/session.inc **********
+
 include('includes/session.inc');
 $Title = _('Customer Receipt') . '/' . _('Credit Note Allocations');
 $ViewTopic= 'ARTransactions';
 $BookMark = 'CustomerAllocations';
 include('includes/header.inc');
 
-include('includes/DefineCustAllocsClass.php');
 include('includes/SQL_CommonFunctions.inc');
 
 if ( isset($_POST['Cancel']) ) {
@@ -207,7 +208,7 @@
 }
 
 if (isset($_GET['AllocTrans'])) {
-	
+
 	if (isset($_SESSION['Alloc'])) {
 		unset($_SESSION['Alloc']->Allocs);
 		unset($_SESSION['Alloc']);
@@ -246,7 +247,7 @@
 	$_SESSION['Alloc']->DebtorNo		= $myrow['debtorno'];
 	$_SESSION['Alloc']->CustomerName	= $myrow['name'];
 	$_SESSION['Alloc']->TransType		= $myrow['type'];
-	$_SESSION['Alloc']->TransTypeName	= _($myrow['typename']);
+	$_SESSION['Alloc']->TransTypeName	= $myrow['typename'];//= _($myrow['typename']); **********
 	$_SESSION['Alloc']->TransNo		= $myrow['transno'];
 	$_SESSION['Alloc']->TransExRate	= $myrow['rate'];
 	$_SESSION['Alloc']->TransAmt		= $myrow['total'];
@@ -278,7 +279,7 @@
 
 	while ($myrow=DB_fetch_array($Result)) {
 		$_SESSION['Alloc']->add_to_AllocsAllocn ($myrow['id'],
-												_($myrow['typename']),
+												$myrow['typename'],//_($myrow['typename']), **********
 												$myrow['transno'],
 												ConvertSQLDate($myrow['trandate']),
 												0,
@@ -320,7 +321,7 @@
 	while ($myrow=DB_fetch_array($Result)) {
 		$DiffOnExchThisOne = ($myrow['amt']/$myrow['rate']) - ($myrow['amt']/$_SESSION['Alloc']->TransExRate);
 		$_SESSION['Alloc']->add_to_AllocsAllocn ($myrow['id'],
-												_($myrow['typename']),
+												$myrow['typename'],//_($myrow['typename']), **********
 												$myrow['transno'],
 												ConvertSQLDate($myrow['trandate']),
 												$myrow['amt'],
@@ -625,7 +626,6 @@
 		<br />';
 }
 
-
 include('includes/footer.inc');
 
 ?>

[Web-erp-svn] SF.net SVN: web-erp:[7693] trunk/CustomerAllocations.php

[<ex...@us...>]

Revision: 7693
          http://sourceforge.net/p/web-erp/reponame/7693
Author:   exsonqu
Date:     2016-12-02 08:48:17 +0000 (Fri, 02 Dec 2016)
Log Message:
-----------
02/12/16 Exson: Fixed the wrong balance in Customer Allocations when customer receipt is positive in CustomerAllocations.php.

Modified Paths:
--------------
    trunk/CustomerAllocations.php

Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php	2016-12-02 07:57:52 UTC (rev 7692)
+++ trunk/CustomerAllocations.php	2016-12-02 08:48:17 UTC (rev 7693)
@@ -577,7 +577,8 @@
 			$BalSQL= "SELECT SUM(ovamount+ovgst+ovfreight+ovdiscount-alloc) as total
 						FROM debtortrans
 						WHERE (type=12 OR type=11)
-						AND debtorno='" . $myrow['debtorno'] . "'";
+						AND debtorno='" . $myrow['debtorno'] . "'
+						AND ovamount<0";
 			$BalResult = DB_query($BalSQL);
 			$BalRow = DB_fetch_array($BalResult);
 			$Balance = $BalRow['total'];