From: <te...@us...> - 2014-12-14 02:04:48
|
Revision: 7021 http://sourceforge.net/p/web-erp/reponame/7021 Author: tehonu Date: 2014-12-14 02:04:44 +0000 (Sun, 14 Dec 2014) Log Message: ----------- Added userid field in stockmoves table. It contains the $_SESSION['UserID'] of the user creating the stock movement Modified StockMovements.php to show the UserID Modified INSERT INTO stockmoves sentences in files: ConfirmDispatch_Invoice.php ContractCosting.php CounterReturns.php CounterSales.php Credit_Invoice.php GoodsReceived.php InternalStockRequestFulfill.php PDFStockCheckComparison.php RecurringSalesOrdersProcess.php ReverseGRN.php SelectCreditItems.php StockAdjustments.php StockLocTransferReceive.php StockTransfers.php SupplierInvoice.php WorkOrderIssue.php WorkOrderReceive.php Modified Paths: -------------- trunk/ConfirmDispatch_Invoice.php trunk/ContractCosting.php trunk/CounterReturns.php trunk/CounterSales.php trunk/Credit_Invoice.php trunk/GoodsReceived.php trunk/InternalStockRequestFulfill.php trunk/PDFStockCheckComparison.php trunk/RecurringSalesOrdersProcess.php trunk/ReverseGRN.php trunk/SelectCreditItems.php trunk/StockAdjustments.php trunk/StockLocTransferReceive.php trunk/StockMovements.php trunk/StockTransfers.php trunk/SupplierInvoice.php trunk/WorkOrderIssue.php trunk/WorkOrderReceive.php trunk/sql/mysql/upgrade4.11-4.12.sql Modified: trunk/ConfirmDispatch_Invoice.php =================================================================== --- trunk/ConfirmDispatch_Invoice.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/ConfirmDispatch_Invoice.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -1029,6 +1029,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, prd, @@ -1042,6 +1043,7 @@ '" . $InvoiceNo . "', '" . $_SESSION['Items'.$identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', '" . $PeriodNo . "', @@ -1084,6 +1086,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1099,6 +1102,7 @@ '" . $InvoiceNo . "', '" . $_SESSION['Items'.$identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1119,6 +1123,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1133,6 +1138,7 @@ '" . $InvoiceNo . "', '" . $_SESSION['Items'.$identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', Modified: trunk/ContractCosting.php =================================================================== --- trunk/ContractCosting.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/ContractCosting.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -345,6 +345,7 @@ transno, loccode, trandate, + userid, price, prd, reference, @@ -356,6 +357,7 @@ '" . $WOReceiptNo . "', '" . $_SESSION['Contract'.$identifier]->LocCode . "', '" . Date('Y-m-d') . "', + '" . $_SESSION['UserID'] . "', '" . ($OtherReqtsBudget+$ContractBOMBudget) . "', '" . $PeriodNo . "', '" . $_SESSION['Contract'.$identifier]->WO . "', Modified: trunk/CounterReturns.php =================================================================== --- trunk/CounterReturns.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/CounterReturns.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -1052,6 +1052,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, prd, @@ -1066,6 +1067,7 @@ '" . $CreditNoteNo . "', '" . $_SESSION['Items' . $identifier]->Location . "', '" . $ReturnDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items' . $identifier]->DebtorNo . "', '" . $_SESSION['Items' . $identifier]->Branch . "', '" . $PeriodNo . "', @@ -1107,6 +1109,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1122,6 +1125,7 @@ '" . $CreditNoteNo . "', '" . $_SESSION['Items' . $identifier]->Location . "', '" . $ReturnDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items' . $identifier]->DebtorNo . "', '" . $_SESSION['Items' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1142,6 +1146,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1155,6 +1160,7 @@ '" . $CreditNoteNo . "', '" . $_SESSION['Items' . $identifier]->Location . "', '" . $ReturnDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items' . $identifier]->DebtorNo . "', '" . $_SESSION['Items' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', Modified: trunk/CounterSales.php =================================================================== --- trunk/CounterSales.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/CounterSales.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -1453,6 +1453,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, prd, @@ -1466,6 +1467,7 @@ '" . $InvoiceNo . "', '" . $_SESSION['Items'.$identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', '" . $PeriodNo . "', @@ -1507,6 +1509,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1522,6 +1525,7 @@ '" . $InvoiceNo . "', '" . $_SESSION['Items'.$identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1542,6 +1546,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1556,6 +1561,7 @@ '" . $InvoiceNo . "', '" . $_SESSION['Items'.$identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['Items'.$identifier]->DebtorNo . "', '" . $_SESSION['Items'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/Credit_Invoice.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -792,6 +792,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, prd, @@ -805,6 +806,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $PeriodNo . "', @@ -821,6 +823,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, prd, @@ -833,6 +836,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $PeriodNo . "', @@ -870,6 +874,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -885,6 +890,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -902,6 +908,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -916,6 +923,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "' '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1001,6 +1009,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1016,6 +1025,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1038,6 +1048,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1055,6 +1066,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1078,6 +1090,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1094,6 +1107,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems' . $identifier]->Location . "', '" . $DefaultDispatchDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "', '" . $_SESSION['CreditItems' . $identifier]->Branch . "', '" . $LocalCurrencyPrice . "', Modified: trunk/GoodsReceived.php =================================================================== --- trunk/GoodsReceived.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/GoodsReceived.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -516,6 +516,7 @@ transno, loccode, trandate, + userid, price, prd, reference, @@ -528,6 +529,7 @@ '" . $GRN . "', '" . $_SESSION['PO'.$identifier]->Location . "', '" . $_POST['DefaultReceivedDate'] . "', + '" . $_SESSION['UserID'] . "', '" . $LocalCurrencyPrice . "', '" . $PeriodNo . "', '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . DB_escape_string($_SESSION['PO'.$identifier]->SupplierName) . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "', Modified: trunk/InternalStockRequestFulfill.php =================================================================== --- trunk/InternalStockRequestFulfill.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/InternalStockRequestFulfill.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -66,6 +66,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -76,6 +77,7 @@ '" . $AdjustmentNumber . "', '" . $Location . "', '" . $SQLAdjustmentDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . $Narrative ."', '" . -$Quantity . "', Modified: trunk/PDFStockCheckComparison.php =================================================================== --- trunk/PDFStockCheckComparison.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/PDFStockCheckComparison.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -101,6 +101,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -110,6 +111,7 @@ '" . $AdjustmentNumber . "', '" . $myrow['loccode'] . "', '" . $SQLAdjustmentDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . _('Inventory Check') . "', '" . $StockQtyDifference . "', Modified: trunk/RecurringSalesOrdersProcess.php =================================================================== --- trunk/RecurringSalesOrdersProcess.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/RecurringSalesOrdersProcess.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -334,6 +334,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -350,6 +351,7 @@ '" . $InvoiceNo . "', '" . $RecurrOrderRow['fromstkloc'] . "', '" . $DelDate . "', + '" . $_SESSION['UserID'] . "', '" . $RecurrOrderRow['debtorno'] . "', '" . $RecurrOrderRow['branchcode'] . "', '" . $LocalCurrencyPrice . "', Modified: trunk/ReverseGRN.php =================================================================== --- trunk/ReverseGRN.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/ReverseGRN.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -228,6 +228,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -239,6 +240,7 @@ '" . $_GET['GRNNo'] . "', '" . $GRN['intostocklocation'] . "', '" . $GRN['deliverydate'] . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . _('Reversal') . ' - ' . $_POST['SupplierID'] . ' - ' . $GRN['orderno'] . "', '" . -$QtyToReverse . "', Modified: trunk/SelectCreditItems.php =================================================================== --- trunk/SelectCreditItems.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/SelectCreditItems.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -1215,6 +1215,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1231,6 +1232,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems'.$identifier]->Location . "', '" . $SQLCreditDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "', '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1255,6 +1257,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1271,6 +1274,7 @@ " . $CreditNo . ", '" . $_SESSION['CreditItems'.$identifier]->Location . "', '" . $SQLCreditDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "', '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1289,6 +1293,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1303,6 +1308,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems'.$identifier]->Location . "', '" . $SQLCreditDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "', '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1466,6 +1472,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, prd, @@ -1480,6 +1487,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems'.$identifier]->Location . "', '" . $SQLCreditDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "', '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $PeriodNo . "', @@ -1522,6 +1530,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1539,6 +1548,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems'.$identifier]->Location . "', '" . $SQLCreditDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "', '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', @@ -1559,6 +1569,7 @@ transno, loccode, trandate, + userid, debtorno, branchcode, price, @@ -1574,6 +1585,7 @@ '" . $CreditNo . "', '" . $_SESSION['CreditItems'.$identifier]->Location . "', '" . $SQLCreditDate . "', + '" . $_SESSION['UserID'] . "', '" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "', '" . $_SESSION['CreditItems'.$identifier]->Branch . "', '" . $LocalCurrencyPrice . "', Modified: trunk/StockAdjustments.php =================================================================== --- trunk/StockAdjustments.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/StockAdjustments.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -215,6 +215,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -225,6 +226,7 @@ '" . $AdjustmentNumber . "', '" . $_SESSION['Adjustment' . $identifier]->StockLocation . "', '" . $SQLAdjustmentDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . $_SESSION['Adjustment' . $identifier]->Narrative ."', '" . $_SESSION['Adjustment' . $identifier]->Quantity . "', Modified: trunk/StockLocTransferReceive.php =================================================================== --- trunk/StockLocTransferReceive.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/StockLocTransferReceive.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -88,6 +88,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -98,6 +99,7 @@ '" . $_SESSION['Transfer']->TrfID . "', '" . $_SESSION['Transfer']->StockLocationFrom . "', '" . $SQLTransferDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . _('To') . ' ' . DB_escape_string($_SESSION['Transfer']->StockLocationToName) . "', '" . round(-$TrfLine->Quantity, $TrfLine->DecimalPlaces) . "', @@ -200,6 +202,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -210,6 +213,7 @@ '" . $_SESSION['Transfer']->TrfID . "', '" . $_SESSION['Transfer']->StockLocationTo . "', '" . $SQLTransferDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . _('From') . ' ' . DB_escape_string($_SESSION['Transfer']->StockLocationFromName) ."', '" . round($TrfLine->Quantity, $TrfLine->DecimalPlaces) . "', Modified: trunk/StockMovements.php =================================================================== --- trunk/StockMovements.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/StockMovements.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -70,6 +70,7 @@ stockmoves.type, stockmoves.transno, stockmoves.trandate, + stockmoves.userid, stockmoves.debtorno, stockmoves.branchcode, stockmoves.qty, @@ -97,6 +98,7 @@ <th>' . _('Type') . '</th> <th>' . _('Number') . '</th> <th>' . _('Date') . '</th> + <th>' . _('User ID') . '</th> <th>' . _('Customer') . '</th> <th>' . _('Branch') . '</th> <th>' . _('Quantity') . '</th> @@ -130,6 +132,7 @@ <td>%s</td> <td>%s</td> <td>%s</td> + <td>%s</td> <td class="number">%s</td> <td>%s</td> <td class="number">%s</td> @@ -141,6 +144,7 @@ $myrow['typename'], $myrow['transno'], $DisplayTranDate, + $myrow['userid'], $myrow['debtorno'], $myrow['branchcode'], locale_number_format($myrow['qty'],$myrow['decimalplaces']), @@ -156,6 +160,7 @@ <td>%s</td> <td>%s</td> <td>%s</td> + <td>%s</td> <td class="number">%s</td> <td>%s</td> <td class="number">%s</td> @@ -166,6 +171,7 @@ $myrow['transno'], $myrow['typename'], $myrow['transno'], + $myrow['userid'], $DisplayTranDate, $myrow['debtorno'], $myrow['branchcode'], @@ -181,6 +187,7 @@ <td>%s</td> <td>%s</td> <td>%s</td> + <td>%s</td> <td class="number">%s</td> <td>%s</td> <td class="number">%s</td> @@ -190,6 +197,7 @@ $myrow['typename'], $myrow['transno'], $DisplayTranDate, + $myrow['userid'], $myrow['debtorno'], $myrow['branchcode'], locale_number_format($myrow['qty'],$myrow['decimalplaces']), Modified: trunk/StockTransfers.php =================================================================== --- trunk/StockTransfers.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/StockTransfers.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -220,6 +220,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -230,6 +231,7 @@ '" . $TransferNumber . "', '" . $_SESSION['Transfer']->StockLocationFrom . "', '" . $SQLTransferDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', 'To " . $_SESSION['Transfer']->StockLocationTo ."', '" . round(-$_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) . "', @@ -336,6 +338,7 @@ transno, loccode, trandate, + userid, prd, reference, qty, @@ -345,6 +348,7 @@ '" . $TransferNumber . "', '" . $_SESSION['Transfer']->StockLocationTo . "', '" . $SQLTransferDate . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . _('From') . " " . $_SESSION['Transfer']->StockLocationFrom . "', '" . $_SESSION['Transfer']->TransferItem[0]->Quantity . "', Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/SupplierInvoice.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -283,6 +283,7 @@ transno, loccode, trandate, + userid, price, prd, reference, @@ -295,6 +296,7 @@ '" . $GRN . "', '" . $_SESSION['PO'.$identifier]->Location . "', '" . FormatDateForSQL($DeliveryDate) . "', + '" . $_SESSION['UserID'] . "', '" . $LocalCurrencyPrice . "', '" . $PeriodNo . "', '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . DB_escape_string($_SESSION['PO'.$identifier]->SupplierName) . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "', Modified: trunk/WorkOrderIssue.php =================================================================== --- trunk/WorkOrderIssue.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/WorkOrderIssue.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -190,6 +190,7 @@ transno, loccode, trandate, + userid, price, prd, reference, @@ -201,6 +202,7 @@ '" . $WOIssueNo . "', '" . $_POST['FromLocation'] . "', '" . FormatDateForSQL($_POST['IssuedDate']) . "', + '" . $_SESSION['UserID'] . "', '" . $IssueItemRow['cost'] . "', '" . $PeriodNo . "', '" . $_POST['WO'] . "', Modified: trunk/WorkOrderReceive.php =================================================================== --- trunk/WorkOrderReceive.php 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/WorkOrderReceive.php 2014-12-14 02:04:44 UTC (rev 7021) @@ -351,6 +351,7 @@ transno, loccode, trandate, + userid, prd, reference, price, @@ -362,6 +363,7 @@ '" . $WOIssueNo . "', '" . $WORow['loccode'] . "', '" . Date('Y-m-d') . "', + '" . $_SESSION['UserID'] . "', '" . $PeriodNo . "', '" . $_POST['WO'] . "', '" . $AutoIssueCompRow['cost'] . "', @@ -459,6 +461,7 @@ transno, loccode, trandate, + userid, price, prd, reference, @@ -470,6 +473,7 @@ '" . $WOReceiptNo . "', '" . $_POST['IntoLocation'] . "', '" . Date('Y-m-d') . "', + '" . $_SESSION['UserID'] . "', '" . $WORow['stdcost'] . "', '" . $PeriodNo . "', '" . $_POST['WO'] . "', Modified: trunk/sql/mysql/upgrade4.11-4.12.sql =================================================================== --- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-12-13 20:06:28 UTC (rev 7020) +++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-12-14 02:04:44 UTC (rev 7021) @@ -3,5 +3,6 @@ INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('Z_UpdateItemCosts.php', '15', 'Use CSV of item codes and costs to update webERP item costs'); INSERT INTO scripts (`script` ,`pagesecurity` ,`description` ) VALUES ('CustomerBalancesMovement.php', '3', 'Allow customers to be listed in local currency with balances and activity over a date range'); INSERT INTO `scripts` VALUES ('UserLocations.php', '15', 'Location User Maintenance'); +ALTER TABLE `stockmoves` ADD `userid` VARCHAR( 20 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `trandate`; UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber'; |