diff --git a/CopyBOM.php b/CopyBOM.php index 43e93e659..b7f681708 100644 --- a/CopyBOM.php +++ b/CopyBOM.php @@ -54,7 +54,6 @@ discountcategory, taxcatid, serialised, - appendfile, perishable, digitals, nextserialno, @@ -82,7 +81,6 @@ discountcategory, taxcatid, serialised, - appendfile, perishable, digitals, nextserialno, diff --git a/Z_ImportStocks.php b/Z_ImportStocks.php index 2328569c4..1c35209e1 100644 --- a/Z_ImportStocks.php +++ b/Z_ImportStocks.php @@ -205,8 +205,7 @@ barcode, discountcategory, taxcatid, - decimalplaces, - appendfile) + decimalplaces) VALUES ( '$StockID', '" . $myrow[1] . "', @@ -224,8 +223,7 @@ '" . $myrow[13] . "', '" . $myrow[14] . "', " . $myrow[15] . ", - " . $myrow[16] . ", - '" . $myrow[17] . "' + " . $myrow[16] . " ); "; diff --git a/api/api_errorcodes.php b/api/api_errorcodes.php index acb20ee8a..d4e65fff1 100644 --- a/api/api_errorcodes.php +++ b/api/api_errorcodes.php @@ -65,7 +65,6 @@ Define('IncorrectDiscountCategory', 1060); Define('TaxCategoriesDoesntExist', 1061); Define('InvalidSerialised', 1062); - Define('IncorrectAppendFile', 1063); Define('InvalidPerishable', 1064); Define('InvalidDecmalPlaces', 1065); Define('IncorrectLongStockDescriptionLength', 1066); diff --git a/api/api_stock.php b/api/api_stock.php index 30b8190e9..a50de52b8 100644 --- a/api/api_stock.php +++ b/api/api_stock.php @@ -232,14 +232,6 @@ function VerifySerialised($Serialised, $i, $Errors) { return $Errors; } -/* Check that the appendfile is 40 characters or less long */ - function VerifyAppendFile($appendfile, $i, $Errors) { - if (mb_strlen($appendfile)>40) { - $Errors[$i] = IncorrectAppendFile; - } - return $Errors; - } - /* Verify that the Perishable flag is a 1 or 0 */ function VerifyPerishable($Perishable, $i, $Errors) { if ($Perishable!=0 and $Perishable!=1) { @@ -348,9 +340,6 @@ function InsertStockItem($StockItemDetails, $user, $password) { if (isset($StockItemDetails['serialised'])){ $Errors=VerifySerialised($StockItemDetails['serialised'], sizeof($Errors), $Errors); } - if (isset($StockItemDetails['appendfile'])){ - $Errors=VerifyAppendFile($StockItemDetails['apendfile'], sizeof($Errors), $Errors); - } if (isset($StockItemDetails['perishable'])){ $Errors=VerifyPerishable($StockItemDetails['perishable'], sizeof($Errors), $Errors); } @@ -468,9 +457,6 @@ function ModifyStockItem($StockItemDetails, $user, $password) { if (isset($StockItemDetails['serialised'])){ $Errors=VerifySerialised($StockItemDetails['serialised'], sizeof($Errors), $Errors); } - if (isset($StockItemDetails['appendfile'])){ - $Errors=VerifyApendFile($StockItemDetails['apendfile'], sizeof($Errors), $Errors); - } if (isset($StockItemDetails['perishable'])){ $Errors=VerifyPerishable($StockItemDetails['perishable'], sizeof($Errors), $Errors); } diff --git a/install/index.php b/install/index.php index cff7cd9ce..e1520134d 100644 --- a/install/index.php +++ b/install/index.php @@ -344,7 +344,6 @@ $Result = mkdir($CompanyDir . '/part_pics'); $Result = mkdir($CompanyDir . '/reports'); $Result = mkdir($CompanyDir . '/reportwriter'); - $Result = mkdir($CompanyDir . '/pdf_append'); copy ($Path_To_Root . '/companies/weberpdemo/FormDesigns/FGLabel.xml', $CompanyDir . '/FormDesigns/FGLabel.xml'); copy ($Path_To_Root . '/companies/weberpdemo/FormDesigns/GoodsReceived.xml', $CompanyDir . '/FormDesigns/GoodsReceived.xml'); diff --git a/sql/mysql/country_sql/default.sql b/sql/mysql/country_sql/default.sql index 3215750f9..dcee86617 100644 --- a/sql/mysql/country_sql/default.sql +++ b/sql/mysql/country_sql/default.sql @@ -2821,7 +2821,6 @@ CREATE TABLE `stockmaster` ( `discountcategory` char(2) NOT NULL DEFAULT '', `taxcatid` tinyint(4) NOT NULL DEFAULT '1', `serialised` tinyint(4) NOT NULL DEFAULT '0', - `appendfile` varchar(40) NOT NULL DEFAULT 'none', `perishable` tinyint(1) NOT NULL DEFAULT '0', `decimalplaces` tinyint(4) NOT NULL DEFAULT '0', `pansize` double NOT NULL DEFAULT '0', diff --git a/sql/mysql/country_sql/demo.sql b/sql/mysql/country_sql/demo.sql index 46921e3a2..db7816beb 100644 --- a/sql/mysql/country_sql/demo.sql +++ b/sql/mysql/country_sql/demo.sql @@ -2823,7 +2823,6 @@ CREATE TABLE `stockmaster` ( `discountcategory` char(2) NOT NULL DEFAULT '', `taxcatid` tinyint(4) NOT NULL DEFAULT '1', `serialised` tinyint(4) NOT NULL DEFAULT '0', - `appendfile` varchar(40) NOT NULL DEFAULT 'none', `perishable` tinyint(1) NOT NULL DEFAULT '0', `decimalplaces` tinyint(4) NOT NULL DEFAULT '0', `pansize` double NOT NULL DEFAULT '0', diff --git a/sql/mysql/upgrade4.15-4.15.1.sql b/sql/mysql/upgrade4.15-4.15.1.sql index 5fefefd42..8bbaa5d58 100644 --- a/sql/mysql/upgrade4.15-4.15.1.sql +++ b/sql/mysql/upgrade4.15-4.15.1.sql @@ -2,6 +2,7 @@ ALTER TABLE `suppliers` ADD COLUMN `defaultgl` VARCHAR(20) NOT NULL DEFAULT '1' ALTER TABLE `suppliers` ADD COLUMN `defaultshipper` INT(11) NOT NULL DEFAULT '0' AFTER `url`; INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_FixGLTransPeriods', '15', 'Fixes periods where GL transactions were not created correctly'); +ALTER TABLE `stockmaster` DROP COLUMN `appendfile`; -- THIS IS THE LAST SQL QUERY. Updates database version number: UPDATE config SET confvalue='4.15.1' WHERE confname='VersionNumber'; \ No newline at end of file