Menu
▾
▴
web-erp-svn
|
From: <tim...@us...> - 2011-09-05 18:55:26
|
Revision: 4679
http://web-erp.svn.sourceforge.net/web-erp/?rev=4679&view=rev
Author: tim_schofield
Date: 2011-09-05 18:55:20 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Add in perishable flag, thereby enabling the decimal places to be shown correctly
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2011-09-05 10:10:57 UTC (rev 4678)
+++ trunk/StockLocTransferReceive.php 2011-09-05 18:55:20 UTC (rev 4679)
@@ -354,6 +354,7 @@
stockmaster.units,
stockmaster.controlled,
stockmaster.serialised,
+ stockmaster.perishable,
stockmaster.decimalplaces,
loctransfers.shipqty,
loctransfers.recqty,
@@ -398,6 +399,7 @@
$myrow['units'],
$myrow['controlled'],
$myrow['serialised'],
+ $myrow['perishable'],
$myrow['decimalplaces']
);
$_SESSION['Transfer']->TransferItem[$i]->PrevRecvQty = $myrow['recqty'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-09-05 18:55:27
|
Revision: 4679
http://web-erp.svn.sourceforge.net/web-erp/?rev=4679&view=rev
Author: tim_schofield
Date: 2011-09-05 18:55:20 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Add in perishable flag, thereby enabling the decimal places to be shown correctly
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2011-09-05 10:10:57 UTC (rev 4678)
+++ trunk/StockLocTransferReceive.php 2011-09-05 18:55:20 UTC (rev 4679)
@@ -354,6 +354,7 @@
stockmaster.units,
stockmaster.controlled,
stockmaster.serialised,
+ stockmaster.perishable,
stockmaster.decimalplaces,
loctransfers.shipqty,
loctransfers.recqty,
@@ -398,6 +399,7 @@
$myrow['units'],
$myrow['controlled'],
$myrow['serialised'],
+ $myrow['perishable'],
$myrow['decimalplaces']
);
$_SESSION['Transfer']->TransferItem[$i]->PrevRecvQty = $myrow['recqty'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-04-19 02:02:39
|
Revision: 5265
http://web-erp.svn.sourceforge.net/web-erp/?rev=5265&view=rev
Author: tehonu
Date: 2012-04-19 02:02:33 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Added ORDER BY locationname at the dropbox
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2012-04-19 01:42:31 UTC (rev 5264)
+++ trunk/StockLocTransferReceive.php 2012-04-19 02:02:33 UTC (rev 5265)
@@ -508,7 +508,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $LocResult = DB_query("SELECT locationname, loccode FROM locations",$db);
+ $LocResult = DB_query("SELECT locationname, loccode FROM locations ORDER BY locationname",$db);
echo '<table class="selection">';
echo '<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-04-19 02:02:39
|
Revision: 5265
http://web-erp.svn.sourceforge.net/web-erp/?rev=5265&view=rev
Author: tehonu
Date: 2012-04-19 02:02:33 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Added ORDER BY locationname at the dropbox
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2012-04-19 01:42:31 UTC (rev 5264)
+++ trunk/StockLocTransferReceive.php 2012-04-19 02:02:33 UTC (rev 5265)
@@ -508,7 +508,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $LocResult = DB_query("SELECT locationname, loccode FROM locations",$db);
+ $LocResult = DB_query("SELECT locationname, loccode FROM locations ORDER BY locationname",$db);
echo '<table class="selection">';
echo '<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2013-01-17 01:54:06
|
Revision: 5793
http://sourceforge.net/p/web-erp/reponame/5793
Author: tehonu
Date: 2013-01-17 01:54:03 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Pak Ricard: Send an email to Inventory Manager when there is a balance cancellation on transfer reception to prevent employee fraud.
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-01-15 14:20:25 UTC (rev 5792)
+++ trunk/StockLocTransferReceive.php 2013-01-17 01:54:03 UTC (rev 5793)
@@ -328,6 +328,15 @@
AND stockid = '". $TrfLine->StockID."'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to set the quantity received to the quantity shipped to cancel the balance on this transfer line');
$Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
+ // send an email to the inventory manager about this cancellation (as can lead to employee fraud)
+ if ($_SESSION['InventoryManagerEmail']!=''){
+ $ConfirmationText = _('Cancelled balance at transfer'). ': ' . $_SESSION['Transfer']->TrfID .
+ ' ' . _('stock code') . ': ' . $TrfLine->StockID .
+ ' ' . _('by user') . ': ' . $_SESSION['UserID'] .
+ ' ' . _('at') . ': ' . Date('Y-m-d H:i:s');
+ $EmailSubject = _('Cancelled balance at transfer'). ' ' . $_SESSION['Transfer']->TrfID;
+ mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
+ }
}
$i++;
} /*end of foreach TransferItem */
|
|
From: <te...@us...> - 2013-01-17 02:11:30
|
Revision: 5794
http://sourceforge.net/p/web-erp/reponame/5794
Author: tehonu
Date: 2013-01-17 02:11:24 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Pak Ricard: Improvement to email text
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-01-17 01:54:03 UTC (rev 5793)
+++ trunk/StockLocTransferReceive.php 2013-01-17 02:11:24 UTC (rev 5794)
@@ -331,9 +331,12 @@
// send an email to the inventory manager about this cancellation (as can lead to employee fraud)
if ($_SESSION['InventoryManagerEmail']!=''){
$ConfirmationText = _('Cancelled balance at transfer'). ': ' . $_SESSION['Transfer']->TrfID .
- ' ' . _('stock code') . ': ' . $TrfLine->StockID .
- ' ' . _('by user') . ': ' . $_SESSION['UserID'] .
- ' ' . _('at') . ': ' . Date('Y-m-d H:i:s');
+ "\r\n" . _('From Location') . ': ' . $_SESSION['Transfer']->StockLocationFrom .
+ "\r\n" . _('To Location') . ': ' . $_SESSION['Transfer']->StockLocationTo .
+ "\r\n" . _('Stock code') . ': ' . $TrfLine->StockID .
+ "\r\n" . _('Qty received') . ': ' . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) .
+ "\r\n" . _('By user') . ': ' . $_SESSION['UserID'] .
+ "\r\n" . _('At') . ': ' . Date('Y-m-d H:i:s');
$EmailSubject = _('Cancelled balance at transfer'). ' ' . $_SESSION['Transfer']->TrfID;
mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
}
|
|
From: <ex...@us...> - 2013-05-12 14:06:34
|
Revision: 5960
http://sourceforge.net/p/web-erp/reponame/5960
Author: exsonqu
Date: 2013-05-12 14:06:31 +0000 (Sun, 12 May 2013)
Log Message:
-----------
12/5/2013 Exson: Make smtp mail available for StockLocTransferReceive.php.
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-05-12 13:53:09 UTC (rev 5959)
+++ trunk/StockLocTransferReceive.php 2013-05-12 14:06:31 UTC (rev 5960)
@@ -338,7 +338,15 @@
"\r\n" . _('By user') . ': ' . $_SESSION['UserID'] .
"\r\n" . _('At') . ': ' . Date('Y-m-d H:i:s');
$EmailSubject = _('Cancelled balance of transfer'). ' ' . $_SESSION['Transfer']->TrfID;
- mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
+ if($_SESSION['SmtpSetting']==0){
+ mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
+ }else{
+ include('includes/htmlMimeMail.php');
+ $mail = new htmlMimeMail();
+ $mail->setSubject($EmailSubject);
+ $mail->setText($ConfirmationText);
+ $result = SendmailBySmtp($mail,array($_SESSION['InventoryManagerEmail']));
+ }
}
}
$i++;
@@ -586,4 +594,4 @@
</form>';
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ice...@us...> - 2013-08-27 02:24:08
|
Revision: 6297
http://sourceforge.net/p/web-erp/reponame/6297
Author: icedlava
Date: 2013-08-27 02:24:06 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Prevent sql error when transfer to location contains special characters such as quotes
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-08-27 02:16:33 UTC (rev 6296)
+++ trunk/StockLocTransferReceive.php 2013-08-27 02:24:06 UTC (rev 6297)
@@ -94,7 +94,7 @@
'" . $_SESSION['Transfer']->StockLocationFrom . "',
'" . $SQLTransferDate . "',
'" . $PeriodNo . "',
- '" . _('To') . ' ' . $_SESSION['Transfer']->StockLocationToName . "',
+ '" . _('To') . ' ' . mysql_real_escape_string($_SESSION['Transfer']->StockLocationToName) . "',
'" . round(-$TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
'" . round($QtyOnHandPrior - $TrfLine->Quantity, $TrfLine->DecimalPlaces) . "'
)";
@@ -330,12 +330,12 @@
$Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
// send an email to the inventory manager about this cancellation (as can lead to employee fraud)
if ($_SESSION['InventoryManagerEmail']!=''){
- $ConfirmationText = _('Cancelled balance of transfer'). ': ' . $_SESSION['Transfer']->TrfID .
+ $ConfirmationText = _('Cancelled balance of transfer'). ': ' . $_SESSION['Transfer']->TrfID .
"\r\n" . _('From Location') . ': ' . $_SESSION['Transfer']->StockLocationFrom .
"\r\n" . _('To Location') . ': ' . $_SESSION['Transfer']->StockLocationTo .
- "\r\n" . _('Stock code') . ': ' . $TrfLine->StockID .
- "\r\n" . _('Qty received') . ': ' . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) .
- "\r\n" . _('By user') . ': ' . $_SESSION['UserID'] .
+ "\r\n" . _('Stock code') . ': ' . $TrfLine->StockID .
+ "\r\n" . _('Qty received') . ': ' . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) .
+ "\r\n" . _('By user') . ': ' . $_SESSION['UserID'] .
"\r\n" . _('At') . ': ' . Date('Y-m-d H:i:s');
$EmailSubject = _('Cancelled balance of transfer'). ' ' . $_SESSION['Transfer']->TrfID;
if($_SESSION['SmtpSetting']==0){
|
|
From: <ice...@us...> - 2013-08-27 02:55:26
|
Revision: 6298
http://sourceforge.net/p/web-erp/reponame/6298
Author: icedlava
Date: 2013-08-27 02:55:22 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Escape for special characters in transfer from location name.
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-08-27 02:24:06 UTC (rev 6297)
+++ trunk/StockLocTransferReceive.php 2013-08-27 02:55:22 UTC (rev 6298)
@@ -206,7 +206,7 @@
'" . $_SESSION['Transfer']->StockLocationTo . "',
'" . $SQLTransferDate . "',
'" . $PeriodNo . "',
- '" . _('From') . ' ' . $_SESSION['Transfer']->StockLocationFromName ."',
+ '" . _('From') . ' ' . mysql_real_escape_string($_SESSION['Transfer']->StockLocationFromName) ."',
'" . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
'" . round($QtyOnHandPrior + $TrfLine->Quantity, $TrfLine->DecimalPlaces) . "'
)";
|
|
From: <ice...@us...> - 2013-08-27 07:33:03
|
Revision: 6299
http://sourceforge.net/p/web-erp/reponame/6299
Author: icedlava
Date: 2013-08-27 07:32:58 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
mysqli_real_escape_string not mysql
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-08-27 02:55:22 UTC (rev 6298)
+++ trunk/StockLocTransferReceive.php 2013-08-27 07:32:58 UTC (rev 6299)
@@ -94,7 +94,7 @@
'" . $_SESSION['Transfer']->StockLocationFrom . "',
'" . $SQLTransferDate . "',
'" . $PeriodNo . "',
- '" . _('To') . ' ' . mysql_real_escape_string($_SESSION['Transfer']->StockLocationToName) . "',
+ '" . _('To') . ' ' . mysqli_real_escape_string($db,$_SESSION['Transfer']->StockLocationToName) . "',
'" . round(-$TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
'" . round($QtyOnHandPrior - $TrfLine->Quantity, $TrfLine->DecimalPlaces) . "'
)";
@@ -206,7 +206,7 @@
'" . $_SESSION['Transfer']->StockLocationTo . "',
'" . $SQLTransferDate . "',
'" . $PeriodNo . "',
- '" . _('From') . ' ' . mysql_real_escape_string($_SESSION['Transfer']->StockLocationFromName) ."',
+ '" . _('From') . ' ' . mysqli_real_escape_string($db,$_SESSION['Transfer']->StockLocationFromName) ."',
'" . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
'" . round($QtyOnHandPrior + $TrfLine->Quantity, $TrfLine->DecimalPlaces) . "'
)";
|
|
From: <ice...@us...> - 2013-08-27 09:13:51
|
Revision: 6300
http://sourceforge.net/p/web-erp/reponame/6300
Author: icedlava
Date: 2013-08-27 09:13:48 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Finally, use DB_escape_string to cater for both mysql/mysqli - thanks Exson
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2013-08-27 07:32:58 UTC (rev 6299)
+++ trunk/StockLocTransferReceive.php 2013-08-27 09:13:48 UTC (rev 6300)
@@ -94,7 +94,7 @@
'" . $_SESSION['Transfer']->StockLocationFrom . "',
'" . $SQLTransferDate . "',
'" . $PeriodNo . "',
- '" . _('To') . ' ' . mysqli_real_escape_string($db,$_SESSION['Transfer']->StockLocationToName) . "',
+ '" . _('To') . ' ' . DB_escape_string($_SESSION['Transfer']->StockLocationToName) . "',
'" . round(-$TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
'" . round($QtyOnHandPrior - $TrfLine->Quantity, $TrfLine->DecimalPlaces) . "'
)";
@@ -206,7 +206,7 @@
'" . $_SESSION['Transfer']->StockLocationTo . "',
'" . $SQLTransferDate . "',
'" . $PeriodNo . "',
- '" . _('From') . ' ' . mysqli_real_escape_string($db,$_SESSION['Transfer']->StockLocationFromName) ."',
+ '" . _('From') . ' ' . DB_escape_string($_SESSION['Transfer']->StockLocationFromName) ."',
'" . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "',
'" . round($QtyOnHandPrior + $TrfLine->Quantity, $TrfLine->DecimalPlaces) . "'
)";
|
|
From: <te...@us...> - 2015-06-11 08:13:33
|
Revision: 7318
http://sourceforge.net/p/web-erp/reponame/7318
Author: tehonu
Date: 2015-06-11 08:13:31 +0000 (Thu, 11 Jun 2015)
Log Message:
-----------
Set the DB-Txn_begin() at correct place to take care of all the items in the Transfer and simplify redundant code conditions
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-06-05 03:28:26 UTC (rev 7317)
+++ trunk/StockLocTransferReceive.php 2015-06-11 08:13:31 UTC (rev 7318)
@@ -64,9 +64,10 @@
if(!$InputError) {
/*All inputs must be sensible so make the stock movement records and update the locations stocks */
+ $Result = DB_Txn_Begin(); // The Txn should affect the full transfer
+
foreach ($_SESSION['Transfer']->TransferItem AS $TrfLine) {
- if($TrfLine->Quantity >=0) {
- $Result = DB_Txn_Begin();
+ if($TrfLine->Quantity >0) {
/* Need to get the current location quantity will need it later for the stock movement */
$SQL="SELECT locstock.quantity
@@ -197,10 +198,8 @@
$QtyOnHandPrior = 0;
}
-// COMMENT: "if($TrfLine->Quantity !=0) {}" should be as a general condition to avoid transactions in zero.
-
// Insert outgoing inventory GL transaction if any of the locations has a GL account code:
- if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
+ if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='')) {
// Get the account code:
if($_SESSION['Transfer']->StockLocationFromAccount !='') {
$AccountCode = $_SESSION['Transfer']->StockLocationFromAccount;
@@ -353,7 +352,7 @@
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
// Insert incoming inventory GL transaction if any of the locations has a GL account code:
- if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='') and $TrfLine->Quantity !=0) {
+ if(($_SESSION['Transfer']->StockLocationFromAccount !='' or $_SESSION['Transfer']->StockLocationToAccount !='')) {
// Get the account code:
if($_SESSION['Transfer']->StockLocationToAccount !='') {
$AccountCode = $_SESSION['Transfer']->StockLocationToAccount;
|
|
From: <te...@us...> - 2015-08-19 07:38:00
|
Revision: 7343
http://sourceforge.net/p/web-erp/reponame/7343
Author: tehonu
Date: 2015-08-19 07:37:57 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
Fixed bug introduced by myself at latest change (record of cancelled items in Transfer).
Modified Paths:
--------------
trunk/StockLocTransferReceive.php
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2015-08-16 05:25:43 UTC (rev 7342)
+++ trunk/StockLocTransferReceive.php 2015-08-19 07:37:57 UTC (rev 7343)
@@ -411,6 +411,11 @@
unset ($_POST['Qty' . $i]);
} /*end if Quantity >= 0 */
if($TrfLine->CancelBalance==1) {
+ $sql = "UPDATE loctransfers SET shipqty = recqty
+ WHERE reference = '". $_SESSION['Transfer']->TrfID . "'
+ AND stockid = '". $TrfLine->StockID."'";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to set the quantity received to the quantity shipped to cancel the balance on this transfer line');
+ $Result = DB_query($sql, $ErrMsg, $DbgMsg, true);
// send an email to the inventory manager about this cancellation (as can lead to employee fraud)
if($_SESSION['InventoryManagerEmail']!='') {
$ConfirmationText = _('Cancelled balance of transfer'). ': ' . $_SESSION['Transfer']->TrfID .
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X