Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6067] trunk
|
From: <te...@us...> - 2013-07-10 02:04:26
|
Revision: 6067
http://sourceforge.net/p/web-erp/reponame/6067
Author: tehonu
Date: 2013-07-10 02:04:22 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Change stockmaster.kgs to grossweight
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CopyBOM.php
trunk/Credit_Invoice.php
trunk/OrderDetails.php
trunk/RecurringSalesOrders.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectSalesOrder.php
trunk/Stocks.php
trunk/Z_ChangeStockCode.php
trunk/Z_ImportStocks.php
trunk/api/api_stock.php
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/sql/mysql/upgrade4.10-4.11.sql
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/ConfirmDispatch_Invoice.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -141,7 +141,7 @@
stockmaster.controlled,
stockmaster.serialised,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.units,
stockmaster.decimalplaces,
stockmaster.mbflag,
@@ -179,7 +179,7 @@
$myrow['discountpercent'],
$myrow['units'],
$myrow['volume'],
- $myrow['kgs'],
+ $myrow['grossweight'],
0,
$myrow['mbflag'],
$myrow['actualdispatchdate'],
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/CopyBOM.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -50,7 +50,7 @@
controlled,
eoq,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
@@ -78,7 +78,7 @@
controlled,
eoq,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/Credit_Invoice.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -112,7 +112,7 @@
stockmaster.description,
stockmaster.longdescription,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.mbflag,
stockmaster.controlled,
stockmaster.serialised,
@@ -153,7 +153,7 @@
$myrow['discountpercent'],
$myrow['units'],
$myrow['volume'],
- $myrow['kgs'],
+ $myrow['grossweight'],
0,
$myrow['mbflag'],
$myrow['trandate'],
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/OrderDetails.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -133,7 +133,7 @@
$LineItemsSQL = "SELECT stkcode,
stockmaster.description,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.decimalplaces,
stockmaster.mbflag,
stockmaster.units,
@@ -205,7 +205,7 @@
$OrderTotal += ($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']));
$OrderTotalVolume += ($myrow['quantity'] * $myrow['volume']);
- $OrderTotalWeight += ($myrow['quantity'] * $myrow['kgs']);
+ $OrderTotalWeight += ($myrow['quantity'] * $myrow['grossweight']);
}
$DisplayTotal = locale_number_format($OrderTotal,$CurrDecimalPlaces);
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/RecurringSalesOrders.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -116,7 +116,7 @@
stockmaster.description,
stockmaster.longdescription,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.units,
recurrsalesorderdetails.unitprice,
recurrsalesorderdetails.quantity,
@@ -145,7 +145,7 @@
$myrow['discountpercent'],
$myrow['units'],
$myrow['volume'],
- $myrow['kgs'],
+ $myrow['grossweight'],
$myrow['qohatloc'],
$myrow['mbflag'],
'',
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/SelectCreditItems.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -454,7 +454,7 @@
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
(materialcost+labourcost+overheadcost) AS standardcost,
stockmaster.mbflag,
stockmaster.decimalplaces,
@@ -482,7 +482,7 @@
0,
$myrow['units'],
$myrow['volume'],
- $myrow['kgs'],
+ $myrow['grossweight'],
0,
$myrow['mbflag'],
Date($_SESSION['DefaultDateFormat']),
@@ -622,7 +622,7 @@
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.mbflag,
stockmaster.discountcategory,
stockmaster.controlled,
@@ -651,7 +651,7 @@
0,
$myrow['units'],
$myrow['volume'],
- $myrow['kgs'],
+ $myrow['grossweight'],
0,
$myrow['mbflag'],
Date($_SESSION['DefaultDateFormat']),
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/SelectOrderItems.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -200,7 +200,7 @@
stockmaster.description,
stockmaster.longdescription,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.units,
stockmaster.serialised,
stockmaster.nextserialno,
@@ -240,7 +240,7 @@
$myrow['discountpercent'],
$myrow['units'],
$myrow['volume'],
- $myrow['kgs'],
+ $myrow['grossweight'],
$myrow['qohatloc'],
$myrow['mbflag'],
$myrow['actualdispatchdate'],
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/SelectSalesOrder.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -51,7 +51,7 @@
purchdata.conversionfactor,
purchdata.leadtime,
purchdata.suppliersuom,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.volume,
stockcategory.stockact,
SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS orderqty
@@ -72,7 +72,7 @@
purchdata.conversionfactor,
purchdata.leadtime,
purchdata.suppliersuom,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.volume,
stockcategory.stockact
ORDER BY purchdata.supplierno,
@@ -96,7 +96,7 @@
purchdata.conversionfactor,
purchdata.leadtime,
purchdata.suppliersuom,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.volume,
stockcategory.stockact,
SUM(bom.quantity *(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)) AS orderqty
@@ -125,7 +125,7 @@
purchdata.conversionfactor,
purchdata.leadtime,
purchdata.suppliersuom,
- stockmaster.kgs,
+ stockmaster.grossweight,
stockmaster.volume,
stockcategory.stockact
ORDER BY purchdata.supplierno,
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/Stocks.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -161,13 +161,13 @@
$Errors[$i] = 'Volume';
$i++;
}
- if (!is_numeric(filter_number_format($_POST['KGS']))) {
+ if (!is_numeric(filter_number_format($_POST['grossweight']))) {
$InputError = 1;
prnMsg(_('The weight of the packaged item in KGs must be numeric'),'error');
$Errors[$i] = 'KGS';
$i++;
}
- if (filter_number_format($_POST['KGS'])<0) {
+ if (filter_number_format($_POST['grossweight'])<0) {
$InputError = 1;
prnMsg(_('The weight of the packaged item must be a positive number'),'error');
$Errors[$i] = 'KGS';
@@ -395,7 +395,7 @@
mbflag='" . $_POST['MBFlag'] . "',
eoq='" . filter_number_format($_POST['EOQ']) . "',
volume='" . filter_number_format($_POST['Volume']) . "',
- kgs='" . filter_number_format($_POST['KGS']) . "',
+ grossweight='" . filter_number_format($_POST['grossweight']) . "',
barcode='" . $_POST['BarCode'] . "',
discountcategory='" . $_POST['DiscountCategory'] . "',
taxcatid='" . $_POST['TaxCat'] . "',
@@ -567,7 +567,7 @@
serialised,
perishable,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
@@ -586,7 +586,7 @@
'" . $_POST['Serialised']. "',
'" . $_POST['Perishable']. "',
'" . filter_number_format($_POST['Volume']) . "',
- '" . filter_number_format($_POST['KGS']) . "',
+ '" . filter_number_format($_POST['grossweight']) . "',
'" . $_POST['BarCode'] . "',
'" . $_POST['DiscountCategory'] . "',
'" . $_POST['TaxCat'] . "',
@@ -664,7 +664,7 @@
unset($_POST['Serialised']);
unset($_POST['Perishable']);
unset($_POST['Volume']);
- unset($_POST['KGS']);
+ unset($_POST['grossweight']);
unset($_POST['BarCode']);
unset($_POST['ReorderLevel']);
unset($_POST['DiscountCategory']);
@@ -810,7 +810,7 @@
unset($_POST['Serialised']);
unset($_POST['Perishable']);
unset($_POST['Volume']);
- unset($_POST['KGS']);
+ unset($_POST['grossweight']);
unset($_POST['BarCode']);
unset($_POST['ReorderLevel']);
unset($_POST['DiscountCategory']);
@@ -873,7 +873,7 @@
perishable,
eoq,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
@@ -898,7 +898,7 @@
$_POST['Serialised'] = $myrow['serialised'];
$_POST['Perishable'] = $myrow['perishable'];
$_POST['Volume'] = $myrow['volume'];
- $_POST['KGS'] = $myrow['kgs'];
+ $_POST['grossweight'] = $myrow['grossweight'];
$_POST['BarCode'] = $myrow['barcode'];
$_POST['DiscountCategory'] = $myrow['discountcategory'];
$_POST['TaxCat'] = $myrow['taxcatid'];
@@ -1018,8 +1018,8 @@
if (!isset($_POST['Volume']) OR $_POST['Volume']==''){
$_POST['Volume']=0;
}
-if (!isset($_POST['KGS']) OR $_POST['KGS']==''){
- $_POST['KGS']=0;
+if (!isset($_POST['grossweight']) OR $_POST['grossweight']==''){
+ $_POST['grossweight']=0;
}
if (!isset($_POST['Controlled']) OR $_POST['Controlled']==''){
$_POST['Controlled']=0;
@@ -1054,7 +1054,7 @@
</tr>';
echo '<tr>
- <td>' . _('Packaged Weight (KGs)') . ':</td><td><input ' . (in_array('KGS',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="KGS" size="12" maxlength="10" value="' . locale_number_format($_POST['KGS'],'Variable') . '" /></td>
+ <td>' . _('Packaged Weight (KGs)') . ':</td><td><input ' . (in_array('grossweight',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="grossweight" size="12" maxlength="10" value="' . locale_number_format($_POST['grossweight'],'Variable') . '" /></td>
</tr>';
echo '<tr>
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/Z_ChangeStockCode.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -59,7 +59,7 @@
controlled,
eoq,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
@@ -85,7 +85,7 @@
controlled,
eoq,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/Z_ImportStocks.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -22,7 +22,7 @@
'Serialised', // 9 'SERIALISED',
'Perishable', // 10 'PERISHABLE',
'Volume', // 11 'VOLUME',
- 'KGS', // 12 'KGS',
+ 'grossweight', // 12 'grossweight',
'BarCode', // 13 'BARCODE',
'DiscountCategory', // 14 'DISCOUNTCATEGORY',
'TaxCat', // 15 'TAXCAT',
@@ -195,7 +195,7 @@
serialised,
perishable,
volume,
- kgs,
+ grossweight,
barcode,
discountcategory,
taxcatid,
Modified: trunk/api/api_stock.php
===================================================================
--- trunk/api/api_stock.php 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/api/api_stock.php 2013-07-10 02:04:22 UTC (rev 6067)
@@ -333,8 +333,8 @@
if (isset($StockItemDetails['volume'])){
$Errors=VerifyVolume($StockItemDetails['volume'], sizeof($Errors), $Errors);
}
- if (isset($StockItemDetails['kgs'])){
- $Errors=VerifyKgs($StockItemDetails['kgs'], sizeof($Errors), $Errors);
+ if (isset($StockItemDetails['grossweight'])){
+ $Errors=VerifyKgs($StockItemDetails['grossweight'], sizeof($Errors), $Errors);
}
if (isset($StockItemDetails['barcode'])){
$Errors=VerifyBarCode($StockItemDetails['barcode'], sizeof($Errors), $Errors);
@@ -453,8 +453,8 @@
if (isset($StockItemDetails['volume'])){
$Errors=VerifyVolume($StockItemDetails['volume'], sizeof($Errors), $Errors);
}
- if (isset($StockItemDetails['kgs'])){
- $Errors=VerifyKgs($StockItemDetails['kgs'], sizeof($Errors), $Errors);
+ if (isset($StockItemDetails['grossweight'])){
+ $Errors=VerifyKgs($StockItemDetails['grossweight'], sizeof($Errors), $Errors);
}
if (isset($StockItemDetails['barcode'])){
$Errors=VerifyBarCode($StockItemDetails['barcode'], sizeof($Errors), $Errors);
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2013-07-10 02:04:22 UTC (rev 6067)
@@ -36,7 +36,7 @@
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
- stockmaster.kgs,
+ stockmaster.grossweight,
(materialcost+labourcost+overheadcost) AS standardcost,
locstock.quantity,
stockmaster.mbflag,
@@ -211,7 +211,7 @@
$Discount,
$myItemRow['units'],
$myItemRow['volume'],
- $myItemRow['kgs'],
+ $myItemRow['grossweight'],
$myItemRow['quantity'],
$myItemRow['mbflag'],
NULL, /*Actual Dispatch Date */
Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql 2013-07-09 09:07:19 UTC (rev 6066)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql 2013-07-10 02:04:22 UTC (rev 6067)
@@ -171,5 +171,7 @@
INSERT INTO config VALUES ('ShopShowInfoLinks','1');
INSERT INTO config VALUES ('ShopTitle','Shop Home');
+ALTER TABLE `stockmaster` CHANGE `kgs` `grossweight` DECIMAL( 20, 4 ) NOT NULL DEFAULT '0.0000'
+
UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
|
