From 83d8e9ba4692103d34ec0b5b4553358f8bac0e1d Mon Sep 17 00:00:00 2001
From: Ap Muthu
Date: Tue, 3 Apr 2018 08:04:09 +0100
Subject: [PATCH] Synch sqls with upgrade sqls #28
Files changed in commit:
sql/mysql/country_sql/default.sql
sql/mysql/country_sql/demo.sql
sql/mysql/upgrade4.14.1-4.14.2.sql
On branch master
Some SQL statements in the default.sql and demo.sql files
listed as version 4.14.1 are duplicated in the upgrade to
version 4.15 as listed in upgrade4.14.1-4.14.2.sql.
These need to be synched with the default data files.
Referenced by: https://github.com/timschofield/webERP-svn/issues/28
---
sql/mysql/country_sql/default.sql | 981 ++++++++++++++---------------
sql/mysql/country_sql/demo.sql | 189 +++---
sql/mysql/upgrade4.14.1-4.14.2.sql | 6 +-
3 files changed, 588 insertions(+), 588 deletions(-)
diff --git a/sql/mysql/country_sql/default.sql b/sql/mysql/country_sql/default.sql
index 38a7d7a32..7dafde8a9 100644
--- a/sql/mysql/country_sql/default.sql
+++ b/sql/mysql/country_sql/default.sql
@@ -7,7 +7,7 @@ SET FOREIGN_KEY_CHECKS = 0;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -157,7 +157,7 @@ CREATE TABLE `banktrans` (
KEY `ref` (`ref`),
CONSTRAINT `banktrans_ibfk_1` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `banktrans_ibfk_2` FOREIGN KEY (`bankact`) REFERENCES `bankaccounts` (`accountcode`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -249,7 +249,7 @@ CREATE TABLE `cogsglpostings` (
KEY `StkCat` (`stkcat`),
KEY `GLCode` (`glcode`),
KEY `SalesType` (`salestype`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -359,7 +359,7 @@ CREATE TABLE `contractreqts` (
PRIMARY KEY (`contractreqid`),
KEY `ContractRef` (`contractref`),
CONSTRAINT `contractreqts_ibfk_1` FOREIGN KEY (`contractref`) REFERENCES `contracts` (`contractref`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -433,7 +433,7 @@ CREATE TABLE `custallocns` (
KEY `TransID_AllocTo` (`transid_allocto`),
CONSTRAINT `custallocns_ibfk_1` FOREIGN KEY (`transid_allocfrom`) REFERENCES `debtortrans` (`id`),
CONSTRAINT `custallocns_ibfk_2` FOREIGN KEY (`transid_allocto`) REFERENCES `debtortrans` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -508,7 +508,7 @@ CREATE TABLE `custcontacts` (
`email` varchar(55) NOT NULL,
`statement` tinyint(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`contid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -650,7 +650,7 @@ CREATE TABLE `debtortrans` (
KEY `salesperson` (`salesperson`),
CONSTRAINT `debtortrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `debtortrans_ibfk_3` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -680,7 +680,7 @@ CREATE TABLE `debtortype` (
`typeid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typename` varchar(100) NOT NULL,
PRIMARY KEY (`typeid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -733,7 +733,7 @@ CREATE TABLE `departments` (
`description` varchar(100) NOT NULL DEFAULT '',
`authoriser` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`departmentid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -783,7 +783,7 @@ CREATE TABLE `edi_orders_segs` (
PRIMARY KEY (`id`),
KEY `SegTag` (`segtag`),
KEY `SegNo` (`seggroup`)
-) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -937,7 +937,7 @@ CREATE TABLE `fixedassets` (
`depnrate` double NOT NULL,
`disposaldate` date NOT NULL DEFAULT '0000-00-00',
PRIMARY KEY (`assetid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1077,7 +1077,7 @@ CREATE TABLE `gltrans` (
CONSTRAINT `gltrans_ibfk_1` FOREIGN KEY (`account`) REFERENCES `chartmaster` (`accountcode`),
CONSTRAINT `gltrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `gltrans_ibfk_3` FOREIGN KEY (`periodno`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=198 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1105,7 +1105,7 @@ CREATE TABLE `grns` (
KEY `SupplierID` (`supplierid`),
CONSTRAINT `grns_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`),
CONSTRAINT `grns_ibfk_2` FOREIGN KEY (`podetailitem`) REFERENCES `purchorderdetails` (`podetailitem`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1159,7 +1159,7 @@ CREATE TABLE `labelfields` (
PRIMARY KEY (`labelfieldid`),
KEY `labelid` (`labelid`),
KEY `vpos` (`vpos`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1180,7 +1180,7 @@ CREATE TABLE `labels` (
`rowheight` double NOT NULL DEFAULT '0',
`columnwidth` double NOT NULL DEFAULT '0',
PRIMARY KEY (`labelid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1345,7 +1345,7 @@ CREATE TABLE `mailgroups` (
`groupname` varchar(100) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `groupname` (`groupname`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1361,7 +1361,7 @@ CREATE TABLE `manufacturers` (
`manufacturers_image` varchar(64) DEFAULT NULL,
PRIMARY KEY (`manufacturers_id`),
KEY `manufacturers_name` (`manufacturers_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1428,7 +1428,7 @@ CREATE TABLE `mrpplannedorders` (
`mrpdate` date DEFAULT NULL,
`updateflag` smallint(6) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1452,7 +1452,7 @@ CREATE TABLE `offers` (
KEY `offers_ibfk_2` (`stockid`),
CONSTRAINT `offers_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`),
CONSTRAINT `offers_ibfk_2` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1494,7 +1494,7 @@ CREATE TABLE `paymentmethods` (
`opencashdrawer` tinyint(4) NOT NULL DEFAULT '0',
`percentdiscount` double NOT NULL DEFAULT '0',
PRIMARY KEY (`paymentid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1881,7 +1881,7 @@ CREATE TABLE `purchorderdetails` (
KEY `ShiptRef` (`shiptref`),
KEY `Completed` (`completed`),
CONSTRAINT `purchorderdetails_ibfk_1` FOREIGN KEY (`orderno`) REFERENCES `purchorders` (`orderno`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1933,7 +1933,7 @@ CREATE TABLE `purchorders` (
KEY `AllowPrintPO` (`allowprint`),
CONSTRAINT `purchorders_ibfk_1` FOREIGN KEY (`supplierno`) REFERENCES `suppliers` (`supplierid`),
CONSTRAINT `purchorders_ibfk_2` FOREIGN KEY (`intostocklocation`) REFERENCES `locations` (`loccode`)
-) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2131,7 +2131,7 @@ CREATE TABLE `reportheaders` (
`lower4` varchar(10) NOT NULL DEFAULT '',
PRIMARY KEY (`reportid`),
KEY `ReportHeading` (`reportheading`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2262,7 +2262,7 @@ CREATE TABLE `salesanalysis` (
KEY `BudgetOrActual` (`budgetoractual`),
KEY `Salesperson` (`salesperson`),
CONSTRAINT `salesanalysis_ibfk_1` FOREIGN KEY (`periodno`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2277,7 +2277,7 @@ CREATE TABLE `salescat` (
`salescatname` varchar(50) DEFAULT NULL,
`active` int(11) NOT NULL DEFAULT '1' COMMENT '1 if active 0 if inactive',
PRIMARY KEY (`salescatid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2332,7 +2332,7 @@ CREATE TABLE `salesglpostings` (
KEY `Area` (`area`),
KEY `StkCat` (`stkcat`),
KEY `SalesType` (`salestype`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2519,7 +2519,7 @@ CREATE TABLE `securityroles` (
`secroleid` int(11) NOT NULL AUTO_INCREMENT,
`secrolename` text NOT NULL,
PRIMARY KEY (`secroleid`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2559,7 +2559,7 @@ CREATE TABLE `sellthroughsupport` (
KEY `effectiveto` (`effectiveto`),
KEY `stockid` (`stockid`),
KEY `categoryid` (`categoryid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2619,7 +2619,7 @@ CREATE TABLE `shippers` (
`shippername` char(40) NOT NULL DEFAULT '',
`mincharge` double NOT NULL DEFAULT '0',
PRIMARY KEY (`shipper_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2664,7 +2664,7 @@ CREATE TABLE `stockcatproperties` (
PRIMARY KEY (`stkcatpropid`),
KEY `categoryid` (`categoryid`),
CONSTRAINT `stockcatproperties_ibfk_1` FOREIGN KEY (`categoryid`) REFERENCES `stockcategory` (`categoryid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2702,7 +2702,7 @@ CREATE TABLE `stockcounts` (
KEY `LocCode` (`loccode`),
CONSTRAINT `stockcounts_ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
CONSTRAINT `stockcounts_ibfk_2` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2834,7 +2834,7 @@ CREATE TABLE `stockmoves` (
CONSTRAINT `stockmoves_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `stockmoves_ibfk_3` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`),
CONSTRAINT `stockmoves_ibfk_4` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2879,7 +2879,7 @@ CREATE TABLE `stockrequest` (
KEY `departmentid` (`departmentid`),
CONSTRAINT `stockrequest_ibfk_1` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`),
CONSTRAINT `stockrequest_ibfk_2` FOREIGN KEY (`departmentid`) REFERENCES `departments` (`departmentid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2920,12 +2920,10 @@ CREATE TABLE `stockserialitems` (
`expirationdate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`quantity` double NOT NULL DEFAULT '0',
`qualitytext` text NOT NULL,
- `createdate` DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`stockid`,`serialno`,`loccode`),
KEY `StockID` (`stockid`),
KEY `LocCode` (`loccode`),
KEY `serialno` (`serialno`),
- KEY `createdate` (`createdate`),
CONSTRAINT `stockserialitems_ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
CONSTRAINT `stockserialitems_ibfk_2` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2970,7 +2968,7 @@ CREATE TABLE `suppallocs` (
KEY `DateAlloc` (`datealloc`),
CONSTRAINT `suppallocs_ibfk_1` FOREIGN KEY (`transid_allocfrom`) REFERENCES `supptrans` (`id`),
CONSTRAINT `suppallocs_ibfk_2` FOREIGN KEY (`transid_allocto`) REFERENCES `supptrans` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3030,7 +3028,7 @@ CREATE TABLE `supplierdiscounts` (
KEY `effectivefrom` (`effectivefrom`),
KEY `effectiveto` (`effectiveto`),
KEY `stockid` (`stockid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3090,7 +3088,7 @@ CREATE TABLE `suppliertype` (
`typeid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typename` varchar(100) NOT NULL,
PRIMARY KEY (`typeid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3129,7 +3127,7 @@ CREATE TABLE `supptrans` (
KEY `Type` (`type`),
CONSTRAINT `supptrans_ibfk_1` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `supptrans_ibfk_2` FOREIGN KEY (`supplierno`) REFERENCES `suppliers` (`supplierid`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3174,7 +3172,7 @@ CREATE TABLE `tags` (
`tagref` tinyint(4) NOT NULL AUTO_INCREMENT,
`tagdescription` varchar(50) NOT NULL,
PRIMARY KEY (`tagref`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3197,7 +3195,7 @@ CREATE TABLE `taxauthorities` (
KEY `PurchTaxGLAccount` (`purchtaxglaccount`),
CONSTRAINT `taxauthorities_ibfk_1` FOREIGN KEY (`taxglcode`) REFERENCES `chartmaster` (`accountcode`),
CONSTRAINT `taxauthorities_ibfk_2` FOREIGN KEY (`purchtaxglaccount`) REFERENCES `chartmaster` (`accountcode`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3231,7 +3229,7 @@ CREATE TABLE `taxcategories` (
`taxcatid` tinyint(4) NOT NULL AUTO_INCREMENT,
`taxcatname` varchar(30) NOT NULL DEFAULT '',
PRIMARY KEY (`taxcatid`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3244,7 +3242,7 @@ CREATE TABLE `taxgroups` (
`taxgroupid` tinyint(4) NOT NULL AUTO_INCREMENT,
`taxgroupdescription` varchar(30) NOT NULL DEFAULT '',
PRIMARY KEY (`taxgroupid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3276,7 +3274,7 @@ CREATE TABLE `taxprovinces` (
`taxprovinceid` tinyint(4) NOT NULL AUTO_INCREMENT,
`taxprovincename` varchar(30) NOT NULL DEFAULT '',
PRIMARY KEY (`taxprovinceid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3341,7 +3339,7 @@ CREATE TABLE `unitsofmeasure` (
`unitid` tinyint(4) NOT NULL AUTO_INCREMENT,
`unitname` varchar(15) NOT NULL DEFAULT '',
PRIMARY KEY (`unitid`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3488,7 +3486,7 @@ CREATE TABLE `www_users` (
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
@@ -3524,6 +3522,20 @@ INSERT INTO `accountgroups` VALUES ('Promotions',5,1,6000,'Marketing Expenses');
INSERT INTO `accountgroups` VALUES ('Revenue',1,1,4000,'');
INSERT INTO `accountgroups` VALUES ('Sales',1,1,10,'');
+--
+-- Dumping data for table `accountsection`
+--
+
+INSERT INTO `accountsection` VALUES (1,'Income');
+INSERT INTO `accountsection` VALUES (2,'Cost Of Sales');
+INSERT INTO `accountsection` VALUES (5,'Overheads');
+INSERT INTO `accountsection` VALUES (10,'Fixed Assets');
+INSERT INTO `accountsection` VALUES (15,'Inventory');
+INSERT INTO `accountsection` VALUES (20,'Amounts Receivable');
+INSERT INTO `accountsection` VALUES (25,'Cash');
+INSERT INTO `accountsection` VALUES (30,'Amounts Payable');
+INSERT INTO `accountsection` VALUES (50,'Financed By');
+
--
-- Dumping data for table `bankaccounts`
--
@@ -3684,6 +3696,13 @@ INSERT INTO `chartmaster` VALUES ('8600','Charitable Contributions','Other Reven
INSERT INTO `chartmaster` VALUES ('8900','Other Expenses','Other Revenue and Expenses',-1);
INSERT INTO `chartmaster` VALUES ('9100','Income Tax Provision','Income Tax',-1);
+--
+-- Dumping data for table `cogsglpostings`
+--
+
+INSERT INTO `cogsglpostings` VALUES (5,'AN','ANY','5000','AN');
+INSERT INTO `cogsglpostings` VALUES (6,'123','ANY','6100','AN');
+
--
-- Dumping data for table `companies`
--
@@ -3691,11 +3710,140 @@ INSERT INTO `chartmaster` VALUES ('9100','Income Tax Provision','Income Tax',-1)
INSERT INTO `companies` VALUES (1,'weberpdemo','not entered yet','','123 Web Way','PO Box 123','Queen Street','Melbourne','Victoria 3043','Australia','+61 3 4567 8901','+61 3 4567 8902','weberp@weberpdemo.com','USD','1100','4900','2100','2400','2150','4200','5200','3500',1,1,1,'5600');
--
--- Dumping data for table `cogsglpostings`
+-- Dumping data for table `config`
--
-INSERT INTO `cogsglpostings` VALUES (5,'AN','ANY','5000','AN');
-INSERT INTO `cogsglpostings` VALUES (6,'123','ANY','6100','AN');
+INSERT INTO `config` VALUES ('AllowOrderLineItemNarrative','1');
+INSERT INTO `config` VALUES ('AllowSalesOfZeroCostItems','0');
+INSERT INTO `config` VALUES ('AutoAuthorisePO','1');
+INSERT INTO `config` VALUES ('AutoCreateWOs','1');
+INSERT INTO `config` VALUES ('AutoDebtorNo','0');
+INSERT INTO `config` VALUES ('AutoIssue','1');
+INSERT INTO `config` VALUES ('AutoSupplierNo','0');
+INSERT INTO `config` VALUES ('CheckCreditLimits','1');
+INSERT INTO `config` VALUES ('Check_Price_Charged_vs_Order_Price','1');
+INSERT INTO `config` VALUES ('Check_Qty_Charged_vs_Del_Qty','1');
+INSERT INTO `config` VALUES ('CountryOfOperation','US');
+INSERT INTO `config` VALUES ('CreditingControlledItems_MustExist','0');
+INSERT INTO `config` VALUES ('DB_Maintenance','0');
+INSERT INTO `config` VALUES ('DB_Maintenance_LastRun','2015-08-14');
+INSERT INTO `config` VALUES ('DefaultBlindPackNote','1');
+INSERT INTO `config` VALUES ('DefaultCreditLimit','1000');
+INSERT INTO `config` VALUES ('DefaultCustomerType','1');
+INSERT INTO `config` VALUES ('DefaultDateFormat','d/m/Y');
+INSERT INTO `config` VALUES ('DefaultDisplayRecordsMax','50');
+INSERT INTO `config` VALUES ('DefaultFactoryLocation','MEL');
+INSERT INTO `config` VALUES ('DefaultPriceList','DE');
+INSERT INTO `config` VALUES ('DefaultSupplierType','1');
+INSERT INTO `config` VALUES ('DefaultTaxCategory','1');
+INSERT INTO `config` VALUES ('Default_Shipper','1');
+INSERT INTO `config` VALUES ('DefineControlledOnWOEntry','1');
+INSERT INTO `config` VALUES ('DispatchCutOffTime','14');
+INSERT INTO `config` VALUES ('DoFreightCalc','0');
+INSERT INTO `config` VALUES ('EDIHeaderMsgId','D:01B:UN:EAN010');
+INSERT INTO `config` VALUES ('EDIReference','WEBERP');
+INSERT INTO `config` VALUES ('EDI_Incoming_Orders','companies/weberp/EDI_Incoming_Orders');
+INSERT INTO `config` VALUES ('EDI_MsgPending','companies/weberp/EDI_Pending');
+INSERT INTO `config` VALUES ('EDI_MsgSent','companies/weberp/EDI_Sent');
+INSERT INTO `config` VALUES ('ExchangeRateFeed','Google');
+INSERT INTO `config` VALUES ('Extended_CustomerInfo','1');
+INSERT INTO `config` VALUES ('Extended_SupplierInfo','1');
+INSERT INTO `config` VALUES ('FactoryManagerEmail','manager@company.com');
+INSERT INTO `config` VALUES ('FreightChargeAppliesIfLessThan','1000');
+INSERT INTO `config` VALUES ('FreightTaxCategory','1');
+INSERT INTO `config` VALUES ('FrequentlyOrderedItems','0');
+INSERT INTO `config` VALUES ('geocode_integration','0');
+INSERT INTO `config` VALUES ('GoogleTranslatorAPIKey','');
+INSERT INTO `config` VALUES ('HTTPS_Only','0');
+INSERT INTO `config` VALUES ('InventoryManagerEmail','test@company.com');
+INSERT INTO `config` VALUES ('InvoicePortraitFormat','0');
+INSERT INTO `config` VALUES ('InvoiceQuantityDefault','1');
+INSERT INTO `config` VALUES ('ItemDescriptionLanguages',',fr_FR.utf8,');
+INSERT INTO `config` VALUES ('LogPath','');
+INSERT INTO `config` VALUES ('LogSeverity','0');
+INSERT INTO `config` VALUES ('MaxImageSize','300');
+INSERT INTO `config` VALUES ('MonthsAuditTrail','1');
+INSERT INTO `config` VALUES ('NumberOfMonthMustBeShown','6');
+INSERT INTO `config` VALUES ('NumberOfPeriodsOfStockUsage','12');
+INSERT INTO `config` VALUES ('OverChargeProportion','30');
+INSERT INTO `config` VALUES ('OverReceiveProportion','20');
+INSERT INTO `config` VALUES ('PackNoteFormat','1');
+INSERT INTO `config` VALUES ('PageLength','48');
+INSERT INTO `config` VALUES ('part_pics_dir','companies/weberp/part_pics');
+INSERT INTO `config` VALUES ('PastDueDays1','30');
+INSERT INTO `config` VALUES ('PastDueDays2','60');
+INSERT INTO `config` VALUES ('PO_AllowSameItemMultipleTimes','1');
+INSERT INTO `config` VALUES ('ProhibitJournalsToControlAccounts','1');
+INSERT INTO `config` VALUES ('ProhibitNegativeStock','0');
+INSERT INTO `config` VALUES ('ProhibitPostingsBefore','2013-12-31');
+INSERT INTO `config` VALUES ('PurchasingManagerEmail','test@company.com');
+INSERT INTO `config` VALUES ('QualityCOAText','');
+INSERT INTO `config` VALUES ('QualityLogSamples','0');
+INSERT INTO `config` VALUES ('QualityProdSpecText','');
+INSERT INTO `config` VALUES ('QuickEntries','10');
+INSERT INTO `config` VALUES ('RadioBeaconFileCounter','/home/RadioBeacon/FileCounter');
+INSERT INTO `config` VALUES ('RadioBeaconFTP_user_name','RadioBeacon ftp server user name');
+INSERT INTO `config` VALUES ('RadioBeaconHomeDir','/home/RadioBeacon');
+INSERT INTO `config` VALUES ('RadioBeaconStockLocation','BL');
+INSERT INTO `config` VALUES ('RadioBraconFTP_server','192.168.2.2');
+INSERT INTO `config` VALUES ('RadioBreaconFilePrefix','ORDXX');
+INSERT INTO `config` VALUES ('RadionBeaconFTP_user_pass','Radio Beacon remote ftp server password');
+INSERT INTO `config` VALUES ('reports_dir','companies/weberp/reports');
+INSERT INTO `config` VALUES ('RequirePickingNote','0');
+INSERT INTO `config` VALUES ('RomalpaClause','Ownership will not pass to the buyer until the goods have been paid for in full.');
+INSERT INTO `config` VALUES ('ShopAboutUs','This web-shop software has been developed by Logic Works Ltd for webERP. For support contact Phil Daintree by rnemailrn');
+INSERT INTO `config` VALUES ('ShopAllowBankTransfer','1');
+INSERT INTO `config` VALUES ('ShopAllowCreditCards','1');
+INSERT INTO `config` VALUES ('ShopAllowPayPal','1');
+INSERT INTO `config` VALUES ('ShopAllowSurcharges','1');
+INSERT INTO `config` VALUES ('ShopBankTransferSurcharge','0.0');
+INSERT INTO `config` VALUES ('ShopBranchCode','ANGRY');
+INSERT INTO `config` VALUES ('ShopContactUs','For support contact Logic Works Ltd by rnemail');
+INSERT INTO `config` VALUES ('ShopCreditCardBankAccount','1030');
+INSERT INTO `config` VALUES ('ShopCreditCardGateway','SwipeHQ');
+INSERT INTO `config` VALUES ('ShopCreditCardSurcharge','2.95');
+INSERT INTO `config` VALUES ('ShopDebtorNo','ANGRY');
+INSERT INTO `config` VALUES ('ShopFreightMethod','NoFreight');
+INSERT INTO `config` VALUES ('ShopFreightPolicy','Shipping information');
+INSERT INTO `config` VALUES ('ShopManagerEmail','shopmanager@yourdomain.com');
+INSERT INTO `config` VALUES ('ShopMode','test');
+INSERT INTO `config` VALUES ('ShopName','webERP Demo Store');
+INSERT INTO `config` VALUES ('ShopPayFlowMerchant','');
+INSERT INTO `config` VALUES ('ShopPayFlowPassword','');
+INSERT INTO `config` VALUES ('ShopPayFlowUser','');
+INSERT INTO `config` VALUES ('ShopPayFlowVendor','');
+INSERT INTO `config` VALUES ('ShopPayPalBankAccount','1040');
+INSERT INTO `config` VALUES ('ShopPaypalCommissionAccount','1');
+INSERT INTO `config` VALUES ('ShopPayPalPassword','');
+INSERT INTO `config` VALUES ('ShopPayPalProPassword','');
+INSERT INTO `config` VALUES ('ShopPayPalProSignature','');
+INSERT INTO `config` VALUES ('ShopPayPalProUser','');
+INSERT INTO `config` VALUES ('ShopPayPalSignature','');
+INSERT INTO `config` VALUES ('ShopPayPalSurcharge','3.4');
+INSERT INTO `config` VALUES ('ShopPayPalUser','');
+INSERT INTO `config` VALUES ('ShopPrivacyStatement','We are committed to protecting your privacy.
We recognise that your personal information is confidential and we understand that it is important for you to know how we treat your personal information. Please read on for more information about our Privacy Policy.
1. What information do we collect and how do we use it?
We use the information it collects from you for the following purposes:- To assist us in providing you with a quality service
- To respond to, and process, your request
- To notify competition winners or fulfil promotional obligations
- To inform you of, and provide you with, new and existing products and services offered by us from time to time
Any information we collect will not be used in ways that you have not consented to.
If you send us an email, we will store your email address and the contents of the email. This information will only be used for the purpose for which you have provided it. Electronic mail submitted to us is handled and saved according to the provisions of the the relevant statues.
When we offer contests and promotions, customers who choose to enter are asked to provide personal information. This information may then be used by us to notify winners, or to fulfil promotional obligations.
We may use the information we collect to occasionally notify you about important functionality changes to our website, new and special offers we think you will find valuable. If at any stage you no longer wish to receive these notifications you may opt out by sending us an email.
We do monitor this website in order to identify user trends and to improve the site if necessary. Any of this information, such as the type of site browser your computer has, will be used only in aggregate form and your individual details will not be identified.
2. How do we store and protect your personal information and who has access to that information?
As required by statute, we follow strict procedures when storing and using the information you have provided.
We do not sell, trade or rent your personal information to others. We may provide aggregate statistics about our customers and website trends. However, these statistics will not have any personal information which would identify you.
Only specific employees within our company are able to access your personal data.
This policy means that we may require proof of identity before we disclose any information to you.
3. What should I do if I want to change my details or if I don’t want to be contacted any more?
At any stage you have the right to access and amend or update your personal details. If you do not want to receive any communications from us you may opt out by contacting us see the Contact Us Page
4. What happens if we decide to change this Privacy Policy?
If we change any aspect of our Privacy Policy we will post these changes on this page so that you are always aware of how we are treating your personal information.
5. How can you contact us if you have any questions, comments or concerns about our Privacy Policy?
We welcome any questions or comments you may have please email us via the contact details provided on our Contact Us Page
Please also refer to our Terms and Conditions for more information.
');
+INSERT INTO `config` VALUES ('ShopShowOnlyAvailableItems','0');
+INSERT INTO `config` VALUES ('ShopShowQOHColumn','1');
+INSERT INTO `config` VALUES ('ShopStockLocations','MEL,TOR');
+INSERT INTO `config` VALUES ('ShopSurchargeStockID','PAYTSURCHARGE');
+INSERT INTO `config` VALUES ('ShopSwipeHQAPIKey','');
+INSERT INTO `config` VALUES ('ShopSwipeHQMerchantID','');
+INSERT INTO `config` VALUES ('ShopTermsConditions','These terms cover the use of this website. Use includes visits to our sites, purchases on our sites, participation in our database and promotions. These terms of use apply to you when you use our websites. Please read these terms carefully - if you need to refer to them again they can be accessed from the link at the bottom of any page of our websites.
1. Content
While we endeavour to supply accurate information on this site, errors and omissions may occur. We do not accept any liability, direct or indirect, for any loss or damage which may directly or indirectly result from any advice, opinion, information, representation or omission whether negligent or otherwise, contained on this site. You are solely responsible for the actions you take in reliance on the content on, or accessed, through this site.
We reserve the right to make changes to the content on this site at any time and without notice.
To the extent permitted by law, we make no warranties in relation to the merchantability, fitness for purpose, freedom from computer virus, accuracy or availability of this web site or any other web site.
2. Making a contract with us
When you place an order with us, you are making an offer to buy goods. We will send you an e-mail to confirm that we have received and accepted your order, which indicates that a contract has been made between us. We will take payment from you when we accept your order. In the unlikely event that the goods are no longer available, we will refund your payment to the account it originated from, and advise that the goods are no longer available.
An order is placed on our website via adding a product to the shopping cart and proceeding through our checkout process. The checkout process includes giving us delivery and any other relevant details for your order, entering payment information and submitting your order. The final step consists of a confirmation page with full details of your order, which you are able to print as a receipt of your order. We will also email you with confirmation of your order.
We reserve the right to refuse or cancel any orders that we believe, solely by our own judgement, to be placed for commercial purposes, e.g. any kind of reseller. We also reserve the right to refuse or cancel any orders that we believe, solely by our own judgement, to have been placed fraudulently.
We reserve the right to limit the number of an item customers can purchase in a single transaction.
3. Payment options
We currently accept the following credit cards:
- Visa
- MasterCard
- American Express
You can also pay using PayPal and internet bank transfer. Surcharges may apply for payment by PayPal or credit cards.
4. Pricing
All prices listed are inclusive of relevant taxes. All prices are correct when published. Please note that we reserve the right to alter prices at any time for any reason. If this should happen after you have ordered a product, we will contact you prior to processing your order. Online and in store pricing may differ.
5. Website and Credit Card Security
We want you to have a safe and secure shopping experience online. All payments via our sites are processed using SSL (Secure Socket Layer) protocol, whereby sensitive information is encrypted to protect your privacy.
You can help to protect your details from unauthorised access by logging out each time you finish using the site, particularly if you are doing so from a public or shared computer.
For security purposes certain transactions may require proof of identification.
6. Delivery and Delivery Charges
We do not deliver to Post Office boxes.
Please note that a signature is required for all deliveries. The goods become the recipient’s property and responsibility once they have been signed for at the time of delivery. If goods are lost or damaged in transit, please contact us within 7 business days see Contact Us page for contact details. We will use this delivery information to make a claim against our courier company. We will offer you the choice of a replacement or a full refund, once we have received confirmation from our courier company that delivery was not successful.
7. Restricted Products
Some products on our site carry an age restriction, if a product you have selected is R16 or R18 a message will appear in the cart asking you to confirm you are an appropriate age to purchase the item(s). Confirming this means that you are of an eligible age to purchase the selected product(s). You are also agreeing that you are not purchasing the item on behalf of a person who is not the appropriate age.
8. Delivery Period
Delivery lead time for products may vary. Deliveries to rural addresses may take longer. You will receive an email that confirms that your order has been dispatched.
To ensure successful delivery, please provide a delivery address where someone will be present during business hours to sign for the receipt of your package. You can track your order by entering the tracking number emailed to you in the dispatch email at the Courier\\\'s web-site.
9. Disclaimer
Our websites are intended to provide information for people shopping our products and accessing our services, including making purchases via our website and registering on our database to receive e-mails from us.
While we endeavour to supply accurate information on this site, errors and omissions may occur. We do not accept any liability, direct or indirect, for any loss or damage which may directly or indirectly result from any advice, opinion, information, representation or omission whether negligent or otherwise, contained on this site. You are solely responsible for the actions you take in reliance on the content on, or accessed, through this site.
We reserve the right to make changes to the content on this site at any time and without notice.
To the extent permitted by law, we make no warranties in relation to the merchantability, fitness for purpose, freedom from computer virus, accuracy or availability of this web site or any other web site.
10. Links
Please note that although this site has some hyperlinks to other third party websites, these sites have not been prepared by us are not under our control. The links are only provided as a convenience, and do not imply that we endorse, check, or approve of the third party site. We are not responsible for the privacy principles or content of these third party sites. We are not responsible for the availability of any of these links.
11. Jurisdiction
This website is governed by, and is to be interpreted in accordance with, the laws of ????.
12. Changes to this Agreement
We reserve the right to alter, modify or update these terms of use. These terms apply to your order. We may change our terms and conditions at any time, so please do not assume that the same terms will apply to future orders.
');
+INSERT INTO `config` VALUES ('ShopTitle','Shop Home');
+INSERT INTO `config` VALUES ('ShowStockidOnImages','0');
+INSERT INTO `config` VALUES ('ShowValueOnGRN','1');
+INSERT INTO `config` VALUES ('Show_Settled_LastMonth','1');
+INSERT INTO `config` VALUES ('SmtpSetting','0');
+INSERT INTO `config` VALUES ('SO_AllowSameItemMultipleTimes','1');
+INSERT INTO `config` VALUES ('StandardCostDecimalPlaces','2');
+INSERT INTO `config` VALUES ('TaxAuthorityReferenceName','');
+INSERT INTO `config` VALUES ('UpdateCurrencyRatesDaily','2017-12-05');
+INSERT INTO `config` VALUES ('VersionNumber','4.14.1');
+INSERT INTO `config` VALUES ('WeightedAverageCosting','0');
+INSERT INTO `config` VALUES ('WikiApp','DokuWiki');
+INSERT INTO `config` VALUES ('WikiPath','wiki');
+INSERT INTO `config` VALUES ('WorkingDaysWeek','5');
+INSERT INTO `config` VALUES ('YearEnd','3');
--
-- Dumping data for table `currencies`
@@ -3709,33 +3857,184 @@ INSERT INTO `currencies` VALUES ('Kenyian Shillings','KES','Kenya','none',0,0,0)
INSERT INTO `currencies` VALUES ('US Dollars','USD','United States','Cents',2,1,1);
--
--- Dumping data for table `holdreasons`
---
-
-INSERT INTO `holdreasons` VALUES (1,'Good History',0);
-INSERT INTO `holdreasons` VALUES (20,'Watch',2);
-INSERT INTO `holdreasons` VALUES (51,'In liquidation',1);
-
---
--- Dumping data for table `locations`
+-- Dumping data for table `edi_orders_seg_groups`
--
-INSERT INTO `locations` VALUES ('AN','Anaheim',' ','','','','','United States','','','','Brett',1,'',0,'',0,1,'',1);
-INSERT INTO `locations` VALUES ('MEL','Melbourne','1234 Collins Street','Melbourne','Victoria 2345','','2345','Australia','+(61) (3) 5678901','+61 3 56789013','jacko@webdemo.com','Jack Roberts',1,'ANGRY',0,'ANGRY',1,1,'',1);
-INSERT INTO `locations` VALUES ('TOR','Toronto','Level 100 ','CN Tower','Toronto','','','','','','','Clive Contrary',1,'',1,'',1,1,'',1);
+INSERT INTO `edi_orders_seg_groups` VALUES (0,1,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (1,9999,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (2,99,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (3,99,2);
+INSERT INTO `edi_orders_seg_groups` VALUES (5,5,2);
+INSERT INTO `edi_orders_seg_groups` VALUES (6,5,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (7,5,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (8,10,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (9,9999,8);
+INSERT INTO `edi_orders_seg_groups` VALUES (10,10,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (11,10,10);
+INSERT INTO `edi_orders_seg_groups` VALUES (12,5,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (13,99,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (14,5,13);
+INSERT INTO `edi_orders_seg_groups` VALUES (15,10,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (19,99,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (20,1,19);
+INSERT INTO `edi_orders_seg_groups` VALUES (21,1,19);
+INSERT INTO `edi_orders_seg_groups` VALUES (22,2,19);
+INSERT INTO `edi_orders_seg_groups` VALUES (23,1,19);
+INSERT INTO `edi_orders_seg_groups` VALUES (24,5,19);
+INSERT INTO `edi_orders_seg_groups` VALUES (28,200000,0);
+INSERT INTO `edi_orders_seg_groups` VALUES (32,25,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (33,9999,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (34,99,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (36,5,34);
+INSERT INTO `edi_orders_seg_groups` VALUES (37,9999,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (38,10,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (39,999,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (42,5,39);
+INSERT INTO `edi_orders_seg_groups` VALUES (43,99,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (44,1,43);
+INSERT INTO `edi_orders_seg_groups` VALUES (45,1,43);
+INSERT INTO `edi_orders_seg_groups` VALUES (46,2,43);
+INSERT INTO `edi_orders_seg_groups` VALUES (47,1,43);
+INSERT INTO `edi_orders_seg_groups` VALUES (48,5,43);
+INSERT INTO `edi_orders_seg_groups` VALUES (49,10,28);
+INSERT INTO `edi_orders_seg_groups` VALUES (50,1,0);
--
--- Dumping data for table `paymentterms`
+-- Dumping data for table `edi_orders_segs`
--
-INSERT INTO `paymentterms` VALUES ('20','Due 20th Of the Following Month',0,22);
-INSERT INTO `paymentterms` VALUES ('30','Due By End Of The Following Month',0,30);
-INSERT INTO `paymentterms` VALUES ('7','Payment due within 7 days',7,0);
-INSERT INTO `paymentterms` VALUES ('CA','Cash Only',1,0);
-
---
--- Dumping data for table `reportlinks`
---
+INSERT INTO `edi_orders_segs` VALUES (1,'UNB',0,1);
+INSERT INTO `edi_orders_segs` VALUES (2,'UNH',0,1);
+INSERT INTO `edi_orders_segs` VALUES (3,'BGM',0,1);
+INSERT INTO `edi_orders_segs` VALUES (4,'DTM',0,35);
+INSERT INTO `edi_orders_segs` VALUES (5,'PAI',0,1);
+INSERT INTO `edi_orders_segs` VALUES (6,'ALI',0,5);
+INSERT INTO `edi_orders_segs` VALUES (7,'FTX',0,99);
+INSERT INTO `edi_orders_segs` VALUES (8,'RFF',1,1);
+INSERT INTO `edi_orders_segs` VALUES (9,'DTM',1,5);
+INSERT INTO `edi_orders_segs` VALUES (10,'NAD',2,1);
+INSERT INTO `edi_orders_segs` VALUES (11,'LOC',2,99);
+INSERT INTO `edi_orders_segs` VALUES (12,'FII',2,5);
+INSERT INTO `edi_orders_segs` VALUES (13,'RFF',3,1);
+INSERT INTO `edi_orders_segs` VALUES (14,'CTA',5,1);
+INSERT INTO `edi_orders_segs` VALUES (15,'COM',5,5);
+INSERT INTO `edi_orders_segs` VALUES (16,'TAX',6,1);
+INSERT INTO `edi_orders_segs` VALUES (17,'MOA',6,1);
+INSERT INTO `edi_orders_segs` VALUES (18,'CUX',7,1);
+INSERT INTO `edi_orders_segs` VALUES (19,'DTM',7,5);
+INSERT INTO `edi_orders_segs` VALUES (20,'PAT',8,1);
+INSERT INTO `edi_orders_segs` VALUES (21,'DTM',8,5);
+INSERT INTO `edi_orders_segs` VALUES (22,'PCD',8,1);
+INSERT INTO `edi_orders_segs` VALUES (23,'MOA',9,1);
+INSERT INTO `edi_orders_segs` VALUES (24,'TDT',10,1);
+INSERT INTO `edi_orders_segs` VALUES (25,'LOC',11,1);
+INSERT INTO `edi_orders_segs` VALUES (26,'DTM',11,5);
+INSERT INTO `edi_orders_segs` VALUES (27,'TOD',12,1);
+INSERT INTO `edi_orders_segs` VALUES (28,'LOC',12,2);
+INSERT INTO `edi_orders_segs` VALUES (29,'PAC',13,1);
+INSERT INTO `edi_orders_segs` VALUES (30,'PCI',14,1);
+INSERT INTO `edi_orders_segs` VALUES (31,'RFF',14,1);
+INSERT INTO `edi_orders_segs` VALUES (32,'DTM',14,5);
+INSERT INTO `edi_orders_segs` VALUES (33,'GIN',14,10);
+INSERT INTO `edi_orders_segs` VALUES (34,'EQD',15,1);
+INSERT INTO `edi_orders_segs` VALUES (35,'ALC',19,1);
+INSERT INTO `edi_orders_segs` VALUES (36,'ALI',19,5);
+INSERT INTO `edi_orders_segs` VALUES (37,'DTM',19,5);
+INSERT INTO `edi_orders_segs` VALUES (38,'QTY',20,1);
+INSERT INTO `edi_orders_segs` VALUES (39,'RNG',20,1);
+INSERT INTO `edi_orders_segs` VALUES (40,'PCD',21,1);
+INSERT INTO `edi_orders_segs` VALUES (41,'RNG',21,1);
+INSERT INTO `edi_orders_segs` VALUES (42,'MOA',22,1);
+INSERT INTO `edi_orders_segs` VALUES (43,'RNG',22,1);
+INSERT INTO `edi_orders_segs` VALUES (44,'RTE',23,1);
+INSERT INTO `edi_orders_segs` VALUES (45,'RNG',23,1);
+INSERT INTO `edi_orders_segs` VALUES (46,'TAX',24,1);
+INSERT INTO `edi_orders_segs` VALUES (47,'MOA',24,1);
+INSERT INTO `edi_orders_segs` VALUES (48,'LIN',28,1);
+INSERT INTO `edi_orders_segs` VALUES (49,'PIA',28,25);
+INSERT INTO `edi_orders_segs` VALUES (50,'IMD',28,99);
+INSERT INTO `edi_orders_segs` VALUES (51,'MEA',28,99);
+INSERT INTO `edi_orders_segs` VALUES (52,'QTY',28,99);
+INSERT INTO `edi_orders_segs` VALUES (53,'ALI',28,5);
+INSERT INTO `edi_orders_segs` VALUES (54,'DTM',28,35);
+INSERT INTO `edi_orders_segs` VALUES (55,'MOA',28,10);
+INSERT INTO `edi_orders_segs` VALUES (56,'GIN',28,127);
+INSERT INTO `edi_orders_segs` VALUES (57,'QVR',28,1);
+INSERT INTO `edi_orders_segs` VALUES (58,'FTX',28,99);
+INSERT INTO `edi_orders_segs` VALUES (59,'PRI',32,1);
+INSERT INTO `edi_orders_segs` VALUES (60,'CUX',32,1);
+INSERT INTO `edi_orders_segs` VALUES (61,'DTM',32,5);
+INSERT INTO `edi_orders_segs` VALUES (62,'RFF',33,1);
+INSERT INTO `edi_orders_segs` VALUES (63,'DTM',33,5);
+INSERT INTO `edi_orders_segs` VALUES (64,'PAC',34,1);
+INSERT INTO `edi_orders_segs` VALUES (65,'QTY',34,5);
+INSERT INTO `edi_orders_segs` VALUES (66,'PCI',36,1);
+INSERT INTO `edi_orders_segs` VALUES (67,'RFF',36,1);
+INSERT INTO `edi_orders_segs` VALUES (68,'DTM',36,5);
+INSERT INTO `edi_orders_segs` VALUES (69,'GIN',36,10);
+INSERT INTO `edi_orders_segs` VALUES (70,'LOC',37,1);
+INSERT INTO `edi_orders_segs` VALUES (71,'QTY',37,1);
+INSERT INTO `edi_orders_segs` VALUES (72,'DTM',37,5);
+INSERT INTO `edi_orders_segs` VALUES (73,'TAX',38,1);
+INSERT INTO `edi_orders_segs` VALUES (74,'MOA',38,1);
+INSERT INTO `edi_orders_segs` VALUES (75,'NAD',39,1);
+INSERT INTO `edi_orders_segs` VALUES (76,'CTA',42,1);
+INSERT INTO `edi_orders_segs` VALUES (77,'COM',42,5);
+INSERT INTO `edi_orders_segs` VALUES (78,'ALC',43,1);
+INSERT INTO `edi_orders_segs` VALUES (79,'ALI',43,5);
+INSERT INTO `edi_orders_segs` VALUES (80,'DTM',43,5);
+INSERT INTO `edi_orders_segs` VALUES (81,'QTY',44,1);
+INSERT INTO `edi_orders_segs` VALUES (82,'RNG',44,1);
+INSERT INTO `edi_orders_segs` VALUES (83,'PCD',45,1);
+INSERT INTO `edi_orders_segs` VALUES (84,'RNG',45,1);
+INSERT INTO `edi_orders_segs` VALUES (85,'MOA',46,1);
+INSERT INTO `edi_orders_segs` VALUES (86,'RNG',46,1);
+INSERT INTO `edi_orders_segs` VALUES (87,'RTE',47,1);
+INSERT INTO `edi_orders_segs` VALUES (88,'RNG',47,1);
+INSERT INTO `edi_orders_segs` VALUES (89,'TAX',48,1);
+INSERT INTO `edi_orders_segs` VALUES (90,'MOA',48,1);
+INSERT INTO `edi_orders_segs` VALUES (91,'TDT',49,1);
+INSERT INTO `edi_orders_segs` VALUES (92,'UNS',50,1);
+INSERT INTO `edi_orders_segs` VALUES (93,'MOA',50,1);
+INSERT INTO `edi_orders_segs` VALUES (94,'CNT',50,1);
+INSERT INTO `edi_orders_segs` VALUES (95,'UNT',50,1);
+
+--
+-- Dumping data for table `holdreasons`
+--
+
+INSERT INTO `holdreasons` VALUES (1,'Good History',0);
+INSERT INTO `holdreasons` VALUES (20,'Watch',2);
+INSERT INTO `holdreasons` VALUES (51,'In liquidation',1);
+
+--
+-- Dumping data for table `locations`
+--
+
+INSERT INTO `locations` VALUES ('AN','Anaheim',' ','','','','','United States','','','','Brett',1,'',0,'',0,1,'',1);
+INSERT INTO `locations` VALUES ('MEL','Melbourne','1234 Collins Street','Melbourne','Victoria 2345','','2345','Australia','+(61) (3) 5678901','+61 3 56789013','jacko@webdemo.com','Jack Roberts',1,'ANGRY',0,'ANGRY',1,1,'',1);
+INSERT INTO `locations` VALUES ('TOR','Toronto','Level 100 ','CN Tower','Toronto','','','','','','','Clive Contrary',1,'',1,'',1,1,'',1);
+
+--
+-- Dumping data for table `paymentmethods`
+--
+
+INSERT INTO `paymentmethods` VALUES (1,'Cheque',1,1,1,0,0);
+INSERT INTO `paymentmethods` VALUES (2,'Cash',1,1,0,0,0.25);
+INSERT INTO `paymentmethods` VALUES (3,'Direct Credit',1,1,0,0,0);
+
+--
+-- Dumping data for table `paymentterms`
+--
+
+INSERT INTO `paymentterms` VALUES ('20','Due 20th Of the Following Month',0,22);
+INSERT INTO `paymentterms` VALUES ('30','Due By End Of The Following Month',0,30);
+INSERT INTO `paymentterms` VALUES ('7','Payment due within 7 days',7,0);
+INSERT INTO `paymentterms` VALUES ('CA','Cash Only',1,0);
+
+--
+-- Dumping data for table `reportlinks`
+--
INSERT INTO `reportlinks` VALUES ('accountgroups','accountsection','accountgroups.sectioninaccounts=accountsection.sectionid');
INSERT INTO `reportlinks` VALUES ('accountsection','accountgroups','accountsection.sectionid=accountgroups.sectioninaccounts');
@@ -6459,407 +6758,7 @@ INSERT INTO `salesglpostings` VALUES (2,'AN','AIRCON','5000','4800','DE');
INSERT INTO `salesglpostings` VALUES (3,'AN','ZPAYT','7230','7230','AN');
--
--- Dumping data for table `systypes`
---
-
-INSERT INTO `systypes` VALUES (0,'Journal - GL',8);
-INSERT INTO `systypes` VALUES (1,'Payment - GL',7);
-INSERT INTO `systypes` VALUES (2,'Receipt - GL',1);
-INSERT INTO `systypes` VALUES (3,'Standing Journal',0);
-INSERT INTO `systypes` VALUES (10,'Sales Invoice',2);
-INSERT INTO `systypes` VALUES (11,'Credit Note',1);
-INSERT INTO `systypes` VALUES (12,'Receipt',5);
-INSERT INTO `systypes` VALUES (15,'Journal - Debtors',0);
-INSERT INTO `systypes` VALUES (16,'Location Transfer',28);
-INSERT INTO `systypes` VALUES (17,'Stock Adjustment',28);
-INSERT INTO `systypes` VALUES (18,'Purchase Order',37);
-INSERT INTO `systypes` VALUES (19,'Picking List',0);
-INSERT INTO `systypes` VALUES (20,'Purchase Invoice',45);
-INSERT INTO `systypes` VALUES (21,'Debit Note',8);
-INSERT INTO `systypes` VALUES (22,'Creditors Payment',11);
-INSERT INTO `systypes` VALUES (23,'Creditors Journal',0);
-INSERT INTO `systypes` VALUES (25,'Purchase Order Delivery',59);
-INSERT INTO `systypes` VALUES (26,'Work Order Receipt',8);
-INSERT INTO `systypes` VALUES (28,'Work Order Issue',17);
-INSERT INTO `systypes` VALUES (29,'Work Order Variance',1);
-INSERT INTO `systypes` VALUES (30,'Sales Order',12);
-INSERT INTO `systypes` VALUES (31,'Shipment Close',28);
-INSERT INTO `systypes` VALUES (32,'Contract Close',6);
-INSERT INTO `systypes` VALUES (35,'Cost Update',26);
-INSERT INTO `systypes` VALUES (36,'Exchange Difference',1);
-INSERT INTO `systypes` VALUES (37,'Tenders',0);
-INSERT INTO `systypes` VALUES (38,'Stock Requests',2);
-INSERT INTO `systypes` VALUES (40,'Work Order',37);
-INSERT INTO `systypes` VALUES (41,'Asset Addition',1);
-INSERT INTO `systypes` VALUES (42,'Asset Category Change',1);
-INSERT INTO `systypes` VALUES (43,'Delete w/down asset',1);
-INSERT INTO `systypes` VALUES (44,'Depreciation',1);
-INSERT INTO `systypes` VALUES (49,'Import Fixed Assets',1);
-INSERT INTO `systypes` VALUES (50,'Opening Balance',0);
-INSERT INTO `systypes` VALUES (500,'Auto Debtor Number',21);
-INSERT INTO `systypes` VALUES (600,'Auto Supplier Number',0);
-
---
--- Dumping data for table `taxauthorities`
---
-
-INSERT INTO `taxauthorities` VALUES (1,'Australian GST','2300','2310','','','','');
-INSERT INTO `taxauthorities` VALUES (5,'Sales Tax','2300','2310','','','','');
-INSERT INTO `taxauthorities` VALUES (11,'Canadian GST','2300','2310','','','','');
-INSERT INTO `taxauthorities` VALUES (12,'Ontario PST','2300','2310','','','','');
-INSERT INTO `taxauthorities` VALUES (13,'UK VAT','2300','2310','','','','');
-
---
--- Dumping data for table `taxgroups`
---
-
-INSERT INTO `taxgroups` VALUES (1,'Default');
-INSERT INTO `taxgroups` VALUES (2,'Ontario');
-INSERT INTO `taxgroups` VALUES (3,'UK Inland Revenue');
-
---
--- Dumping data for table `taxauthrates`
---
-
-INSERT INTO `taxauthrates` VALUES (1,1,1,0.1);
-INSERT INTO `taxauthrates` VALUES (1,1,2,0);
-INSERT INTO `taxauthrates` VALUES (1,1,5,0);
-INSERT INTO `taxauthrates` VALUES (5,1,1,0.2);
-INSERT INTO `taxauthrates` VALUES (5,1,2,0.35);
-INSERT INTO `taxauthrates` VALUES (5,1,5,0);
-INSERT INTO `taxauthrates` VALUES (11,1,1,0.07);
-INSERT INTO `taxauthrates` VALUES (11,1,2,0.12);
-INSERT INTO `taxauthrates` VALUES (11,1,5,0.07);
-INSERT INTO `taxauthrates` VALUES (12,1,1,0.05);
-INSERT INTO `taxauthrates` VALUES (12,1,2,0.075);
-INSERT INTO `taxauthrates` VALUES (12,1,5,0);
-INSERT INTO `taxauthrates` VALUES (13,1,1,0);
-INSERT INTO `taxauthrates` VALUES (13,1,2,0);
-INSERT INTO `taxauthrates` VALUES (13,1,5,0);
-
---
--- Dumping data for table `taxcategories`
---
-
-INSERT INTO `taxcategories` VALUES (1,'Taxable supply');
-INSERT INTO `taxcategories` VALUES (2,'Luxury Items');
-INSERT INTO `taxcategories` VALUES (4,'Exempt');
-INSERT INTO `taxcategories` VALUES (5,'Freight');
-
---
--- Dumping data for table `taxprovinces`
---
-
-INSERT INTO `taxprovinces` VALUES (1,'Default Tax province');
-
---
--- Dumping data for table `www_users`
---
-
-INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','admin@weberp.org','MEL',8,1,'2017-12-05 18:46:18','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,1,1,0,50,'fluid','en_GB.utf8',0,0);
-INSERT INTO `www_users` VALUES ('WEB0000021','$2y$10$aTt/treAhiVVd0mPw1Ums.GcOxBtX/3cIsD1RL//0iT3QUYjvIDlS','Phil Daintree','WEB0000021','','','1234564','phil@logicworks.co.nz','TOR',7,0,NULL,'WEB0000021','A4','1,0,0,0,0,0,0,0,0,0,0',0,1,1,0,30,'','en_GB.utf8',0,0);
-
---
--- Dumping data for table `edi_orders_segs`
---
-
-INSERT INTO `edi_orders_segs` VALUES (1,'UNB',0,1);
-INSERT INTO `edi_orders_segs` VALUES (2,'UNH',0,1);
-INSERT INTO `edi_orders_segs` VALUES (3,'BGM',0,1);
-INSERT INTO `edi_orders_segs` VALUES (4,'DTM',0,35);
-INSERT INTO `edi_orders_segs` VALUES (5,'PAI',0,1);
-INSERT INTO `edi_orders_segs` VALUES (6,'ALI',0,5);
-INSERT INTO `edi_orders_segs` VALUES (7,'FTX',0,99);
-INSERT INTO `edi_orders_segs` VALUES (8,'RFF',1,1);
-INSERT INTO `edi_orders_segs` VALUES (9,'DTM',1,5);
-INSERT INTO `edi_orders_segs` VALUES (10,'NAD',2,1);
-INSERT INTO `edi_orders_segs` VALUES (11,'LOC',2,99);
-INSERT INTO `edi_orders_segs` VALUES (12,'FII',2,5);
-INSERT INTO `edi_orders_segs` VALUES (13,'RFF',3,1);
-INSERT INTO `edi_orders_segs` VALUES (14,'CTA',5,1);
-INSERT INTO `edi_orders_segs` VALUES (15,'COM',5,5);
-INSERT INTO `edi_orders_segs` VALUES (16,'TAX',6,1);
-INSERT INTO `edi_orders_segs` VALUES (17,'MOA',6,1);
-INSERT INTO `edi_orders_segs` VALUES (18,'CUX',7,1);
-INSERT INTO `edi_orders_segs` VALUES (19,'DTM',7,5);
-INSERT INTO `edi_orders_segs` VALUES (20,'PAT',8,1);
-INSERT INTO `edi_orders_segs` VALUES (21,'DTM',8,5);
-INSERT INTO `edi_orders_segs` VALUES (22,'PCD',8,1);
-INSERT INTO `edi_orders_segs` VALUES (23,'MOA',9,1);
-INSERT INTO `edi_orders_segs` VALUES (24,'TDT',10,1);
-INSERT INTO `edi_orders_segs` VALUES (25,'LOC',11,1);
-INSERT INTO `edi_orders_segs` VALUES (26,'DTM',11,5);
-INSERT INTO `edi_orders_segs` VALUES (27,'TOD',12,1);
-INSERT INTO `edi_orders_segs` VALUES (28,'LOC',12,2);
-INSERT INTO `edi_orders_segs` VALUES (29,'PAC',13,1);
-INSERT INTO `edi_orders_segs` VALUES (30,'PCI',14,1);
-INSERT INTO `edi_orders_segs` VALUES (31,'RFF',14,1);
-INSERT INTO `edi_orders_segs` VALUES (32,'DTM',14,5);
-INSERT INTO `edi_orders_segs` VALUES (33,'GIN',14,10);
-INSERT INTO `edi_orders_segs` VALUES (34,'EQD',15,1);
-INSERT INTO `edi_orders_segs` VALUES (35,'ALC',19,1);
-INSERT INTO `edi_orders_segs` VALUES (36,'ALI',19,5);
-INSERT INTO `edi_orders_segs` VALUES (37,'DTM',19,5);
-INSERT INTO `edi_orders_segs` VALUES (38,'QTY',20,1);
-INSERT INTO `edi_orders_segs` VALUES (39,'RNG',20,1);
-INSERT INTO `edi_orders_segs` VALUES (40,'PCD',21,1);
-INSERT INTO `edi_orders_segs` VALUES (41,'RNG',21,1);
-INSERT INTO `edi_orders_segs` VALUES (42,'MOA',22,1);
-INSERT INTO `edi_orders_segs` VALUES (43,'RNG',22,1);
-INSERT INTO `edi_orders_segs` VALUES (44,'RTE',23,1);
-INSERT INTO `edi_orders_segs` VALUES (45,'RNG',23,1);
-INSERT INTO `edi_orders_segs` VALUES (46,'TAX',24,1);
-INSERT INTO `edi_orders_segs` VALUES (47,'MOA',24,1);
-INSERT INTO `edi_orders_segs` VALUES (48,'LIN',28,1);
-INSERT INTO `edi_orders_segs` VALUES (49,'PIA',28,25);
-INSERT INTO `edi_orders_segs` VALUES (50,'IMD',28,99);
-INSERT INTO `edi_orders_segs` VALUES (51,'MEA',28,99);
-INSERT INTO `edi_orders_segs` VALUES (52,'QTY',28,99);
-INSERT INTO `edi_orders_segs` VALUES (53,'ALI',28,5);
-INSERT INTO `edi_orders_segs` VALUES (54,'DTM',28,35);
-INSERT INTO `edi_orders_segs` VALUES (55,'MOA',28,10);
-INSERT INTO `edi_orders_segs` VALUES (56,'GIN',28,127);
-INSERT INTO `edi_orders_segs` VALUES (57,'QVR',28,1);
-INSERT INTO `edi_orders_segs` VALUES (58,'FTX',28,99);
-INSERT INTO `edi_orders_segs` VALUES (59,'PRI',32,1);
-INSERT INTO `edi_orders_segs` VALUES (60,'CUX',32,1);
-INSERT INTO `edi_orders_segs` VALUES (61,'DTM',32,5);
-INSERT INTO `edi_orders_segs` VALUES (62,'RFF',33,1);
-INSERT INTO `edi_orders_segs` VALUES (63,'DTM',33,5);
-INSERT INTO `edi_orders_segs` VALUES (64,'PAC',34,1);
-INSERT INTO `edi_orders_segs` VALUES (65,'QTY',34,5);
-INSERT INTO `edi_orders_segs` VALUES (66,'PCI',36,1);
-INSERT INTO `edi_orders_segs` VALUES (67,'RFF',36,1);
-INSERT INTO `edi_orders_segs` VALUES (68,'DTM',36,5);
-INSERT INTO `edi_orders_segs` VALUES (69,'GIN',36,10);
-INSERT INTO `edi_orders_segs` VALUES (70,'LOC',37,1);
-INSERT INTO `edi_orders_segs` VALUES (71,'QTY',37,1);
-INSERT INTO `edi_orders_segs` VALUES (72,'DTM',37,5);
-INSERT INTO `edi_orders_segs` VALUES (73,'TAX',38,1);
-INSERT INTO `edi_orders_segs` VALUES (74,'MOA',38,1);
-INSERT INTO `edi_orders_segs` VALUES (75,'NAD',39,1);
-INSERT INTO `edi_orders_segs` VALUES (76,'CTA',42,1);
-INSERT INTO `edi_orders_segs` VALUES (77,'COM',42,5);
-INSERT INTO `edi_orders_segs` VALUES (78,'ALC',43,1);
-INSERT INTO `edi_orders_segs` VALUES (79,'ALI',43,5);
-INSERT INTO `edi_orders_segs` VALUES (80,'DTM',43,5);
-INSERT INTO `edi_orders_segs` VALUES (81,'QTY',44,1);
-INSERT INTO `edi_orders_segs` VALUES (82,'RNG',44,1);
-INSERT INTO `edi_orders_segs` VALUES (83,'PCD',45,1);
-INSERT INTO `edi_orders_segs` VALUES (84,'RNG',45,1);
-INSERT INTO `edi_orders_segs` VALUES (85,'MOA',46,1);
-INSERT INTO `edi_orders_segs` VALUES (86,'RNG',46,1);
-INSERT INTO `edi_orders_segs` VALUES (87,'RTE',47,1);
-INSERT INTO `edi_orders_segs` VALUES (88,'RNG',47,1);
-INSERT INTO `edi_orders_segs` VALUES (89,'TAX',48,1);
-INSERT INTO `edi_orders_segs` VALUES (90,'MOA',48,1);
-INSERT INTO `edi_orders_segs` VALUES (91,'TDT',49,1);
-INSERT INTO `edi_orders_segs` VALUES (92,'UNS',50,1);
-INSERT INTO `edi_orders_segs` VALUES (93,'MOA',50,1);
-INSERT INTO `edi_orders_segs` VALUES (94,'CNT',50,1);
-INSERT INTO `edi_orders_segs` VALUES (95,'UNT',50,1);
-
---
--- Dumping data for table `edi_orders_seg_groups`
---
-
-INSERT INTO `edi_orders_seg_groups` VALUES (0,1,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (1,9999,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (2,99,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (3,99,2);
-INSERT INTO `edi_orders_seg_groups` VALUES (5,5,2);
-INSERT INTO `edi_orders_seg_groups` VALUES (6,5,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (7,5,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (8,10,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (9,9999,8);
-INSERT INTO `edi_orders_seg_groups` VALUES (10,10,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (11,10,10);
-INSERT INTO `edi_orders_seg_groups` VALUES (12,5,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (13,99,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (14,5,13);
-INSERT INTO `edi_orders_seg_groups` VALUES (15,10,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (19,99,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (20,1,19);
-INSERT INTO `edi_orders_seg_groups` VALUES (21,1,19);
-INSERT INTO `edi_orders_seg_groups` VALUES (22,2,19);
-INSERT INTO `edi_orders_seg_groups` VALUES (23,1,19);
-INSERT INTO `edi_orders_seg_groups` VALUES (24,5,19);
-INSERT INTO `edi_orders_seg_groups` VALUES (28,200000,0);
-INSERT INTO `edi_orders_seg_groups` VALUES (32,25,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (33,9999,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (34,99,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (36,5,34);
-INSERT INTO `edi_orders_seg_groups` VALUES (37,9999,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (38,10,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (39,999,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (42,5,39);
-INSERT INTO `edi_orders_seg_groups` VALUES (43,99,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (44,1,43);
-INSERT INTO `edi_orders_seg_groups` VALUES (45,1,43);
-INSERT INTO `edi_orders_seg_groups` VALUES (46,2,43);
-INSERT INTO `edi_orders_seg_groups` VALUES (47,1,43);
-INSERT INTO `edi_orders_seg_groups` VALUES (48,5,43);
-INSERT INTO `edi_orders_seg_groups` VALUES (49,10,28);
-INSERT INTO `edi_orders_seg_groups` VALUES (50,1,0);
-
---
--- Dumping data for table `config`
---
-
-INSERT INTO `config` VALUES ('AllowOrderLineItemNarrative','1');
-INSERT INTO `config` VALUES ('AllowSalesOfZeroCostItems','0');
-INSERT INTO `config` VALUES ('AutoAuthorisePO','1');
-INSERT INTO `config` VALUES ('AutoCreateWOs','1');
-INSERT INTO `config` VALUES ('AutoDebtorNo','0');
-INSERT INTO `config` VALUES ('AutoIssue','1');
-INSERT INTO `config` VALUES ('AutoSupplierNo','0');
-INSERT INTO `config` VALUES ('CheckCreditLimits','1');
-INSERT INTO `config` VALUES ('Check_Price_Charged_vs_Order_Price','1');
-INSERT INTO `config` VALUES ('Check_Qty_Charged_vs_Del_Qty','1');
-INSERT INTO `config` VALUES ('CountryOfOperation','US');
-INSERT INTO `config` VALUES ('CreditingControlledItems_MustExist','0');
-INSERT INTO `config` VALUES ('DB_Maintenance','0');
-INSERT INTO `config` VALUES ('DB_Maintenance_LastRun','2015-08-14');
-INSERT INTO `config` VALUES ('DefaultBlindPackNote','1');
-INSERT INTO `config` VALUES ('DefaultCreditLimit','1000');
-INSERT INTO `config` VALUES ('DefaultCustomerType','1');
-INSERT INTO `config` VALUES ('DefaultDateFormat','d/m/Y');
-INSERT INTO `config` VALUES ('DefaultDisplayRecordsMax','50');
-INSERT INTO `config` VALUES ('DefaultFactoryLocation','MEL');
-INSERT INTO `config` VALUES ('DefaultPriceList','DE');
-INSERT INTO `config` VALUES ('DefaultSupplierType','1');
-INSERT INTO `config` VALUES ('DefaultTaxCategory','1');
-INSERT INTO `config` VALUES ('Default_Shipper','1');
-INSERT INTO `config` VALUES ('DefineControlledOnWOEntry','1');
-INSERT INTO `config` VALUES ('DispatchCutOffTime','14');
-INSERT INTO `config` VALUES ('DoFreightCalc','0');
-INSERT INTO `config` VALUES ('EDIHeaderMsgId','D:01B:UN:EAN010');
-INSERT INTO `config` VALUES ('EDIReference','WEBERP');
-INSERT INTO `config` VALUES ('EDI_Incoming_Orders','companies/test/EDI_Incoming_Orders');
-INSERT INTO `config` VALUES ('EDI_MsgPending','companies/test/EDI_Pending');
-INSERT INTO `config` VALUES ('EDI_MsgSent','companies/test/EDI_Sent');
-INSERT INTO `config` VALUES ('ExchangeRateFeed','Google');
-INSERT INTO `config` VALUES ('Extended_CustomerInfo','1');
-INSERT INTO `config` VALUES ('Extended_SupplierInfo','1');
-INSERT INTO `config` VALUES ('FactoryManagerEmail','manager@company.com');
-INSERT INTO `config` VALUES ('FreightChargeAppliesIfLessThan','1000');
-INSERT INTO `config` VALUES ('FreightTaxCategory','1');
-INSERT INTO `config` VALUES ('FrequentlyOrderedItems','0');
-INSERT INTO `config` VALUES ('geocode_integration','0');
-INSERT INTO `config` VALUES ('GoogleTranslatorAPIKey','');
-INSERT INTO `config` VALUES ('HTTPS_Only','0');
-INSERT INTO `config` VALUES ('InventoryManagerEmail','test@company.com');
-INSERT INTO `config` VALUES ('InvoicePortraitFormat','0');
-INSERT INTO `config` VALUES ('InvoiceQuantityDefault','1');
-INSERT INTO `config` VALUES ('ItemDescriptionLanguages',',fr_FR.utf8,');
-INSERT INTO `config` VALUES ('LogPath','');
-INSERT INTO `config` VALUES ('LogSeverity','0');
-INSERT INTO `config` VALUES ('MaxImageSize','300');
-INSERT INTO `config` VALUES ('MonthsAuditTrail','1');
-INSERT INTO `config` VALUES ('NumberOfMonthMustBeShown','6');
-INSERT INTO `config` VALUES ('NumberOfPeriodsOfStockUsage','12');
-INSERT INTO `config` VALUES ('OverChargeProportion','30');
-INSERT INTO `config` VALUES ('OverReceiveProportion','20');
-INSERT INTO `config` VALUES ('PackNoteFormat','1');
-INSERT INTO `config` VALUES ('PageLength','48');
-INSERT INTO `config` VALUES ('part_pics_dir','companies/weberpdemo/part_pics');
-INSERT INTO `config` VALUES ('PastDueDays1','30');
-INSERT INTO `config` VALUES ('PastDueDays2','60');
-INSERT INTO `config` VALUES ('PO_AllowSameItemMultipleTimes','1');
-INSERT INTO `config` VALUES ('ProhibitJournalsToControlAccounts','1');
-INSERT INTO `config` VALUES ('ProhibitNegativeStock','0');
-INSERT INTO `config` VALUES ('ProhibitPostingsBefore','2013-12-31');
-INSERT INTO `config` VALUES ('PurchasingManagerEmail','test@company.com');
-INSERT INTO `config` VALUES ('QualityCOAText','');
-INSERT INTO `config` VALUES ('QualityLogSamples','0');
-INSERT INTO `config` VALUES ('QualityProdSpecText','');
-INSERT INTO `config` VALUES ('QuickEntries','10');
-INSERT INTO `config` VALUES ('RadioBeaconFileCounter','/home/RadioBeacon/FileCounter');
-INSERT INTO `config` VALUES ('RadioBeaconFTP_user_name','RadioBeacon ftp server user name');
-INSERT INTO `config` VALUES ('RadioBeaconHomeDir','/home/RadioBeacon');
-INSERT INTO `config` VALUES ('RadioBeaconStockLocation','BL');
-INSERT INTO `config` VALUES ('RadioBraconFTP_server','192.168.2.2');
-INSERT INTO `config` VALUES ('RadioBreaconFilePrefix','ORDXX');
-INSERT INTO `config` VALUES ('RadionBeaconFTP_user_pass','Radio Beacon remote ftp server password');
-INSERT INTO `config` VALUES ('reports_dir','companies/weberpdemo/reports');
-INSERT INTO `config` VALUES ('RequirePickingNote','0');
-INSERT INTO `config` VALUES ('RomalpaClause','Ownership will not pass to the buyer until the goods have been paid for in full.');
-INSERT INTO `config` VALUES ('ShopAboutUs','This web-shop software has been developed by Logic Works Ltd for webERP. For support contact Phil Daintree by rnemailrn');
-INSERT INTO `config` VALUES ('ShopAllowBankTransfer','1');
-INSERT INTO `config` VALUES ('ShopAllowCreditCards','1');
-INSERT INTO `config` VALUES ('ShopAllowPayPal','1');
-INSERT INTO `config` VALUES ('ShopAllowSurcharges','1');
-INSERT INTO `config` VALUES ('ShopBankTransferSurcharge','0.0');
-INSERT INTO `config` VALUES ('ShopBranchCode','ANGRY');
-INSERT INTO `config` VALUES ('ShopContactUs','For support contact Logic Works Ltd by rnemail');
-INSERT INTO `config` VALUES ('ShopCreditCardBankAccount','1030');
-INSERT INTO `config` VALUES ('ShopCreditCardGateway','SwipeHQ');
-INSERT INTO `config` VALUES ('ShopCreditCardSurcharge','2.95');
-INSERT INTO `config` VALUES ('ShopDebtorNo','ANGRY');
-INSERT INTO `config` VALUES ('ShopFreightMethod','NoFreight');
-INSERT INTO `config` VALUES ('ShopFreightPolicy','Shipping information');
-INSERT INTO `config` VALUES ('ShopManagerEmail','shopmanager@yourdomain.com');
-INSERT INTO `config` VALUES ('ShopMode','test');
-INSERT INTO `config` VALUES ('ShopName','webERP Demo Store');
-INSERT INTO `config` VALUES ('ShopPayFlowMerchant','');
-INSERT INTO `config` VALUES ('ShopPayFlowPassword','');
-INSERT INTO `config` VALUES ('ShopPayFlowUser','');
-INSERT INTO `config` VALUES ('ShopPayFlowVendor','');
-INSERT INTO `config` VALUES ('ShopPayPalBankAccount','1040');
-INSERT INTO `config` VALUES ('ShopPaypalCommissionAccount','1');
-INSERT INTO `config` VALUES ('ShopPayPalPassword','');
-INSERT INTO `config` VALUES ('ShopPayPalProPassword','');
-INSERT INTO `config` VALUES ('ShopPayPalProSignature','');
-INSERT INTO `config` VALUES ('ShopPayPalProUser','');
-INSERT INTO `config` VALUES ('ShopPayPalSignature','');
-INSERT INTO `config` VALUES ('ShopPayPalSurcharge','3.4');
-INSERT INTO `config` VALUES ('ShopPayPalUser','');
-INSERT INTO `config` VALUES ('ShopPrivacyStatement','We are committed to protecting your privacy.
We recognise that your personal information is confidential and we understand that it is important for you to know how we treat your personal information. Please read on for more information about our Privacy Policy.
1. What information do we collect and how do we use it?
We use the information it collects from you for the following purposes:- To assist us in providing you with a quality service
- To respond to, and process, your request
- To notify competition winners or fulfil promotional obligations
- To inform you of, and provide you with, new and existing products and services offered by us from time to time
Any information we collect will not be used in ways that you have not consented to.
If you send us an email, we will store your email address and the contents of the email. This information will only be used for the purpose for which you have provided it. Electronic mail submitted to us is handled and saved according to the provisions of the the relevant statues.
When we offer contests and promotions, customers who choose to enter are asked to provide personal information. This information may then be used by us to notify winners, or to fulfil promotional obligations.
We may use the information we collect to occasionally notify you about important functionality changes to our website, new and special offers we think you will find valuable. If at any stage you no longer wish to receive these notifications you may opt out by sending us an email.
We do monitor this website in order to identify user trends and to improve the site if necessary. Any of this information, such as the type of site browser your computer has, will be used only in aggregate form and your individual details will not be identified.
2. How do we store and protect your personal information and who has access to that information?
As required by statute, we follow strict procedures when storing and using the information you have provided.
We do not sell, trade or rent your personal information to others. We may provide aggregate statistics about our customers and website trends. However, these statistics will not have any personal information which would identify you.
Only specific employees within our company are able to access your personal data.
This policy means that we may require proof of identity before we disclose any information to you.
3. What should I do if I want to change my details or if I don’t want to be contacted any more?
At any stage you have the right to access and amend or update your personal details. If you do not want to receive any communications from us you may opt out by contacting us see the Contact Us Page
4. What happens if we decide to change this Privacy Policy?
If we change any aspect of our Privacy Policy we will post these changes on this page so that you are always aware of how we are treating your personal information.
5. How can you contact us if you have any questions, comments or concerns about our Privacy Policy?
We welcome any questions or comments you may have please email us via the contact details provided on our Contact Us Page
Please also refer to our Terms and Conditions for more information.
');
-INSERT INTO `config` VALUES ('ShopShowOnlyAvailableItems','0');
-INSERT INTO `config` VALUES ('ShopShowQOHColumn','1');
-INSERT INTO `config` VALUES ('ShopStockLocations','MEL,TOR');
-INSERT INTO `config` VALUES ('ShopSurchargeStockID','PAYTSURCHARGE');
-INSERT INTO `config` VALUES ('ShopSwipeHQAPIKey','');
-INSERT INTO `config` VALUES ('ShopSwipeHQMerchantID','');
-INSERT INTO `config` VALUES ('ShopTermsConditions','These terms cover the use of this website. Use includes visits to our sites, purchases on our sites, participation in our database and promotions. These terms of use apply to you when you use our websites. Please read these terms carefully - if you need to refer to them again they can be accessed from the link at the bottom of any page of our websites.
1. Content
While we endeavour to supply accurate information on this site, errors and omissions may occur. We do not accept any liability, direct or indirect, for any loss or damage which may directly or indirectly result from any advice, opinion, information, representation or omission whether negligent or otherwise, contained on this site. You are solely responsible for the actions you take in reliance on the content on, or accessed, through this site.
We reserve the right to make changes to the content on this site at any time and without notice.
To the extent permitted by law, we make no warranties in relation to the merchantability, fitness for purpose, freedom from computer virus, accuracy or availability of this web site or any other web site.
2. Making a contract with us
When you place an order with us, you are making an offer to buy goods. We will send you an e-mail to confirm that we have received and accepted your order, which indicates that a contract has been made between us. We will take payment from you when we accept your order. In the unlikely event that the goods are no longer available, we will refund your payment to the account it originated from, and advise that the goods are no longer available.
An order is placed on our website via adding a product to the shopping cart and proceeding through our checkout process. The checkout process includes giving us delivery and any other relevant details for your order, entering payment information and submitting your order. The final step consists of a confirmation page with full details of your order, which you are able to print as a receipt of your order. We will also email you with confirmation of your order.
We reserve the right to refuse or cancel any orders that we believe, solely by our own judgement, to be placed for commercial purposes, e.g. any kind of reseller. We also reserve the right to refuse or cancel any orders that we believe, solely by our own judgement, to have been placed fraudulently.
We reserve the right to limit the number of an item customers can purchase in a single transaction.
3. Payment options
We currently accept the following credit cards:
- Visa
- MasterCard
- American Express
You can also pay using PayPal and internet bank transfer. Surcharges may apply for payment by PayPal or credit cards.4. Pricing
All prices listed are inclusive of relevant taxes. All prices are correct when published. Please note that we reserve the right to alter prices at any time for any reason. If this should happen after you have ordered a product, we will contact you prior to processing your order. Online and in store pricing may differ.
5. Website and Credit Card Security
We want you to have a safe and secure shopping experience online. All payments via our sites are processed using SSL (Secure Socket Layer) protocol, whereby sensitive information is encrypted to protect your privacy.
You can help to protect your details from unauthorised access by logging out each time you finish using the site, particularly if you are doing so from a public or shared computer.
For security purposes certain transactions may require proof of identification.
6. Delivery and Delivery Charges
We do not deliver to Post Office boxes.
Please note that a signature is required for all deliveries. The goods become the recipient’s property and responsibility once they have been signed for at the time of delivery. If goods are lost or damaged in transit, please contact us within 7 business days see Contact Us page for contact details. We will use this delivery information to make a claim against our courier company. We will offer you the choice of a replacement or a full refund, once we have received confirmation from our courier company that delivery was not successful.
7. Restricted Products
Some products on our site carry an age restriction, if a product you have selected is R16 or R18 a message will appear in the cart asking you to confirm you are an appropriate age to purchase the item(s). Confirming this means that you are of an eligible age to purchase the selected product(s). You are also agreeing that you are not purchasing the item on behalf of a person who is not the appropriate age.
8. Delivery Period
Delivery lead time for products may vary. Deliveries to rural addresses may take longer. You will receive an email that confirms that your order has been dispatched.
To ensure successful delivery, please provide a delivery address where someone will be present during business hours to sign for the receipt of your package. You can track your order by entering the tracking number emailed to you in the dispatch email at the Courier\\\'s web-site.
9. Disclaimer
Our websites are intended to provide information for people shopping our products and accessing our services, including making purchases via our website and registering on our database to receive e-mails from us.
While we endeavour to supply accurate information on this site, errors and omissions may occur. We do not accept any liability, direct or indirect, for any loss or damage which may directly or indirectly result from any advice, opinion, information, representation or omission whether negligent or otherwise, contained on this site. You are solely responsible for the actions you take in reliance on the content on, or accessed, through this site.
We reserve the right to make changes to the content on this site at any time and without notice.
To the extent permitted by law, we make no warranties in relation to the merchantability, fitness for purpose, freedom from computer virus, accuracy or availability of this web site or any other web site.
10. Links
Please note that although this site has some hyperlinks to other third party websites, these sites have not been prepared by us are not under our control. The links are only provided as a convenience, and do not imply that we endorse, check, or approve of the third party site. We are not responsible for the privacy principles or content of these third party sites. We are not responsible for the availability of any of these links.
11. Jurisdiction
This website is governed by, and is to be interpreted in accordance with, the laws of ????.
12. Changes to this Agreement
We reserve the right to alter, modify or update these terms of use. These terms apply to your order. We may change our terms and conditions at any time, so please do not assume that the same terms will apply to future orders.
');
-INSERT INTO `config` VALUES ('ShopTitle','Shop Home');
-INSERT INTO `config` VALUES ('ShowStockidOnImages','0');
-INSERT INTO `config` VALUES ('ShowValueOnGRN','1');
-INSERT INTO `config` VALUES ('Show_Settled_LastMonth','1');
-INSERT INTO `config` VALUES ('SmtpSetting','0');
-INSERT INTO `config` VALUES ('SO_AllowSameItemMultipleTimes','1');
-INSERT INTO `config` VALUES ('StandardCostDecimalPlaces','2');
-INSERT INTO `config` VALUES ('TaxAuthorityReferenceName','');
-INSERT INTO `config` VALUES ('UpdateCurrencyRatesDaily','2017-12-05');
-INSERT INTO `config` VALUES ('VersionNumber','4.14.1');
-INSERT INTO `config` VALUES ('WeightedAverageCosting','0');
-INSERT INTO `config` VALUES ('WikiApp','DokuWiki');
-INSERT INTO `config` VALUES ('WikiPath','wiki');
-INSERT INTO `config` VALUES ('WorkingDaysWeek','5');
-INSERT INTO `config` VALUES ('YearEnd','3');
-
---
--- Dumping data for table `unitsofmeasure`
---
-
-INSERT INTO `unitsofmeasure` VALUES (1,'each');
-INSERT INTO `unitsofmeasure` VALUES (2,'meters');
-INSERT INTO `unitsofmeasure` VALUES (3,'kgs');
-INSERT INTO `unitsofmeasure` VALUES (4,'litres');
-INSERT INTO `unitsofmeasure` VALUES (5,'length');
-INSERT INTO `unitsofmeasure` VALUES (6,'hours');
-INSERT INTO `unitsofmeasure` VALUES (7,'feet');
-
---
--- Dumping data for table `paymentmethods`
---
-
-INSERT INTO `paymentmethods` VALUES (1,'Cheque',1,1,1,0,0);
-INSERT INTO `paymentmethods` VALUES (2,'Cash',1,1,0,0,0.25);
-INSERT INTO `paymentmethods` VALUES (3,'Direct Credit',1,1,0,0,0);
-
---
--- Dumping data for table `scripts`
+-- Dumping data for table `scripts`
--
INSERT INTO `scripts` VALUES ('AccountGroups.php',10,'Defines the groupings of general ledger accounts');
@@ -7339,6 +7238,20 @@ INSERT INTO `securitygroups` VALUES (8,16);
INSERT INTO `securitygroups` VALUES (9,0);
INSERT INTO `securitygroups` VALUES (9,9);
+--
+-- Dumping data for table `securityroles`
+--
+
+INSERT INTO `securityroles` VALUES (1,'Inquiries/Order Entry');
+INSERT INTO `securityroles` VALUES (2,'Manufac/Stock Admin');
+INSERT INTO `securityroles` VALUES (3,'Purchasing Officer');
+INSERT INTO `securityroles` VALUES (4,'AP Clerk');
+INSERT INTO `securityroles` VALUES (5,'AR Clerk');
+INSERT INTO `securityroles` VALUES (6,'Accountant');
+INSERT INTO `securityroles` VALUES (7,'Customer Log On Only');
+INSERT INTO `securityroles` VALUES (8,'System Administrator');
+INSERT INTO `securityroles` VALUES (9,'Supplier Log On Only');
+
--
-- Dumping data for table `securitytokens`
--
@@ -7364,32 +7277,118 @@ INSERT INTO `securitytokens` VALUES (18,'Cost authority');
INSERT INTO `securitytokens` VALUES (19,'Internal stock request fully access authority');
--
--- Dumping data for table `securityroles`
+-- Dumping data for table `systypes`
--
-INSERT INTO `securityroles` VALUES (1,'Inquiries/Order Entry');
-INSERT INTO `securityroles` VALUES (2,'Manufac/Stock Admin');
-INSERT INTO `securityroles` VALUES (3,'Purchasing Officer');
-INSERT INTO `securityroles` VALUES (4,'AP Clerk');
-INSERT INTO `securityroles` VALUES (5,'AR Clerk');
-INSERT INTO `securityroles` VALUES (6,'Accountant');
-INSERT INTO `securityroles` VALUES (7,'Customer Log On Only');
-INSERT INTO `securityroles` VALUES (8,'System Administrator');
-INSERT INTO `securityroles` VALUES (9,'Supplier Log On Only');
+INSERT INTO `systypes` VALUES (0,'Journal - GL',8);
+INSERT INTO `systypes` VALUES (1,'Payment - GL',7);
+INSERT INTO `systypes` VALUES (2,'Receipt - GL',1);
+INSERT INTO `systypes` VALUES (3,'Standing Journal',0);
+INSERT INTO `systypes` VALUES (10,'Sales Invoice',2);
+INSERT INTO `systypes` VALUES (11,'Credit Note',1);
+INSERT INTO `systypes` VALUES (12,'Receipt',5);
+INSERT INTO `systypes` VALUES (15,'Journal - Debtors',0);
+INSERT INTO `systypes` VALUES (16,'Location Transfer',28);
+INSERT INTO `systypes` VALUES (17,'Stock Adjustment',28);
+INSERT INTO `systypes` VALUES (18,'Purchase Order',37);
+INSERT INTO `systypes` VALUES (19,'Picking List',0);
+INSERT INTO `systypes` VALUES (20,'Purchase Invoice',45);
+INSERT INTO `systypes` VALUES (21,'Debit Note',8);
+INSERT INTO `systypes` VALUES (22,'Creditors Payment',11);
+INSERT INTO `systypes` VALUES (23,'Creditors Journal',0);
+INSERT INTO `systypes` VALUES (25,'Purchase Order Delivery',59);
+INSERT INTO `systypes` VALUES (26,'Work Order Receipt',8);
+INSERT INTO `systypes` VALUES (28,'Work Order Issue',17);
+INSERT INTO `systypes` VALUES (29,'Work Order Variance',1);
+INSERT INTO `systypes` VALUES (30,'Sales Order',12);
+INSERT INTO `systypes` VALUES (31,'Shipment Close',28);
+INSERT INTO `systypes` VALUES (32,'Contract Close',6);
+INSERT INTO `systypes` VALUES (35,'Cost Update',26);
+INSERT INTO `systypes` VALUES (36,'Exchange Difference',1);
+INSERT INTO `systypes` VALUES (37,'Tenders',0);
+INSERT INTO `systypes` VALUES (38,'Stock Requests',2);
+INSERT INTO `systypes` VALUES (40,'Work Order',37);
+INSERT INTO `systypes` VALUES (41,'Asset Addition',1);
+INSERT INTO `systypes` VALUES (42,'Asset Category Change',1);
+INSERT INTO `systypes` VALUES (43,'Delete w/down asset',1);
+INSERT INTO `systypes` VALUES (44,'Depreciation',1);
+INSERT INTO `systypes` VALUES (49,'Import Fixed Assets',1);
+INSERT INTO `systypes` VALUES (50,'Opening Balance',0);
+INSERT INTO `systypes` VALUES (500,'Auto Debtor Number',21);
+INSERT INTO `systypes` VALUES (600,'Auto Supplier Number',0);
--
--- Dumping data for table `accountsection`
+-- Dumping data for table `taxauthorities`
--
-INSERT INTO `accountsection` VALUES (1,'Income');
-INSERT INTO `accountsection` VALUES (2,'Cost Of Sales');
-INSERT INTO `accountsection` VALUES (5,'Overheads');
-INSERT INTO `accountsection` VALUES (10,'Fixed Assets');
-INSERT INTO `accountsection` VALUES (15,'Inventory');
-INSERT INTO `accountsection` VALUES (20,'Amounts Receivable');
-INSERT INTO `accountsection` VALUES (25,'Cash');
-INSERT INTO `accountsection` VALUES (30,'Amounts Payable');
-INSERT INTO `accountsection` VALUES (50,'Financed By');
+INSERT INTO `taxauthorities` VALUES (1,'Australian GST','2300','2310','','','','');
+INSERT INTO `taxauthorities` VALUES (5,'Sales Tax','2300','2310','','','','');
+INSERT INTO `taxauthorities` VALUES (11,'Canadian GST','2300','2310','','','','');
+INSERT INTO `taxauthorities` VALUES (12,'Ontario PST','2300','2310','','','','');
+INSERT INTO `taxauthorities` VALUES (13,'UK VAT','2300','2310','','','','');
+
+--
+-- Dumping data for table `taxauthrates`
+--
+
+INSERT INTO `taxauthrates` VALUES (1,1,1,0.1);
+INSERT INTO `taxauthrates` VALUES (1,1,2,0);
+INSERT INTO `taxauthrates` VALUES (1,1,5,0);
+INSERT INTO `taxauthrates` VALUES (5,1,1,0.2);
+INSERT INTO `taxauthrates` VALUES (5,1,2,0.35);
+INSERT INTO `taxauthrates` VALUES (5,1,5,0);
+INSERT INTO `taxauthrates` VALUES (11,1,1,0.07);
+INSERT INTO `taxauthrates` VALUES (11,1,2,0.12);
+INSERT INTO `taxauthrates` VALUES (11,1,5,0.07);
+INSERT INTO `taxauthrates` VALUES (12,1,1,0.05);
+INSERT INTO `taxauthrates` VALUES (12,1,2,0.075);
+INSERT INTO `taxauthrates` VALUES (12,1,5,0);
+INSERT INTO `taxauthrates` VALUES (13,1,1,0);
+INSERT INTO `taxauthrates` VALUES (13,1,2,0);
+INSERT INTO `taxauthrates` VALUES (13,1,5,0);
+
+--
+-- Dumping data for table `taxcategories`
+--
+
+INSERT INTO `taxcategories` VALUES (1,'Taxable supply');
+INSERT INTO `taxcategories` VALUES (2,'Luxury Items');
+INSERT INTO `taxcategories` VALUES (4,'Exempt');
+INSERT INTO `taxcategories` VALUES (5,'Freight');
+
+--
+-- Dumping data for table `taxgroups`
+--
+
+INSERT INTO `taxgroups` VALUES (1,'Default');
+INSERT INTO `taxgroups` VALUES (2,'Ontario');
+INSERT INTO `taxgroups` VALUES (3,'UK Inland Revenue');
+
+--
+-- Dumping data for table `taxprovinces`
+--
+
+INSERT INTO `taxprovinces` VALUES (1,'Default Tax province');
+
+--
+-- Dumping data for table `unitsofmeasure`
+--
+
+INSERT INTO `unitsofmeasure` VALUES (1,'each');
+INSERT INTO `unitsofmeasure` VALUES (2,'meters');
+INSERT INTO `unitsofmeasure` VALUES (3,'kgs');
+INSERT INTO `unitsofmeasure` VALUES (4,'litres');
+INSERT INTO `unitsofmeasure` VALUES (5,'length');
+INSERT INTO `unitsofmeasure` VALUES (6,'hours');
+INSERT INTO `unitsofmeasure` VALUES (7,'feet');
+
+--
+-- Dumping data for table `www_users`
+--
+
+INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','admin@weberp.org','MEL',8,1,'2017-12-05 18:46:18','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,1,1,0,50,'fluid','en_GB.utf8',0,0);
+INSERT INTO `www_users` VALUES ('WEB0000021','$2y$10$aTt/treAhiVVd0mPw1Ums.GcOxBtX/3cIsD1RL//0iT3QUYjvIDlS','Phil Daintree','WEB0000021','','','1234564','phil@logicworks.co.nz','TOR',7,0,NULL,'WEB0000021','A4','1,0,0,0,0,0,0,0,0,0,0',0,1,1,0,30,'','en_GB.utf8',0,0);
+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
diff --git a/sql/mysql/country_sql/demo.sql b/sql/mysql/country_sql/demo.sql
index bb2b4193a..f8f440882 100644
--- a/sql/mysql/country_sql/demo.sql
+++ b/sql/mysql/country_sql/demo.sql
@@ -9,7 +9,7 @@ SET FOREIGN_KEY_CHECKS = 0;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -159,7 +159,7 @@ CREATE TABLE `banktrans` (
KEY `ref` (`ref`),
CONSTRAINT `banktrans_ibfk_1` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `banktrans_ibfk_2` FOREIGN KEY (`bankact`) REFERENCES `bankaccounts` (`accountcode`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -251,7 +251,7 @@ CREATE TABLE `cogsglpostings` (
KEY `StkCat` (`stkcat`),
KEY `GLCode` (`glcode`),
KEY `SalesType` (`salestype`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -361,7 +361,7 @@ CREATE TABLE `contractreqts` (
PRIMARY KEY (`contractreqid`),
KEY `ContractRef` (`contractref`),
CONSTRAINT `contractreqts_ibfk_1` FOREIGN KEY (`contractref`) REFERENCES `contracts` (`contractref`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -435,7 +435,7 @@ CREATE TABLE `custallocns` (
KEY `TransID_AllocTo` (`transid_allocto`),
CONSTRAINT `custallocns_ibfk_1` FOREIGN KEY (`transid_allocfrom`) REFERENCES `debtortrans` (`id`),
CONSTRAINT `custallocns_ibfk_2` FOREIGN KEY (`transid_allocto`) REFERENCES `debtortrans` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -510,7 +510,7 @@ CREATE TABLE `custcontacts` (
`email` varchar(55) NOT NULL,
`statement` tinyint(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`contid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -652,7 +652,7 @@ CREATE TABLE `debtortrans` (
KEY `salesperson` (`salesperson`),
CONSTRAINT `debtortrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `debtortrans_ibfk_3` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -682,7 +682,7 @@ CREATE TABLE `debtortype` (
`typeid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typename` varchar(100) NOT NULL,
PRIMARY KEY (`typeid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -735,7 +735,7 @@ CREATE TABLE `departments` (
`description` varchar(100) NOT NULL DEFAULT '',
`authoriser` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`departmentid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -785,7 +785,7 @@ CREATE TABLE `edi_orders_segs` (
PRIMARY KEY (`id`),
KEY `SegTag` (`segtag`),
KEY `SegNo` (`seggroup`)
-) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -939,7 +939,7 @@ CREATE TABLE `fixedassets` (
`depnrate` double NOT NULL,
`disposaldate` date NOT NULL DEFAULT '0000-00-00',
PRIMARY KEY (`assetid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1079,7 +1079,7 @@ CREATE TABLE `gltrans` (
CONSTRAINT `gltrans_ibfk_1` FOREIGN KEY (`account`) REFERENCES `chartmaster` (`accountcode`),
CONSTRAINT `gltrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `gltrans_ibfk_3` FOREIGN KEY (`periodno`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=198 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1107,7 +1107,7 @@ CREATE TABLE `grns` (
KEY `SupplierID` (`supplierid`),
CONSTRAINT `grns_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`),
CONSTRAINT `grns_ibfk_2` FOREIGN KEY (`podetailitem`) REFERENCES `purchorderdetails` (`podetailitem`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1161,7 +1161,7 @@ CREATE TABLE `labelfields` (
PRIMARY KEY (`labelfieldid`),
KEY `labelid` (`labelid`),
KEY `vpos` (`vpos`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1182,7 +1182,7 @@ CREATE TABLE `labels` (
`rowheight` double NOT NULL DEFAULT '0',
`columnwidth` double NOT NULL DEFAULT '0',
PRIMARY KEY (`labelid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1347,7 +1347,7 @@ CREATE TABLE `mailgroups` (
`groupname` varchar(100) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `groupname` (`groupname`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1363,7 +1363,7 @@ CREATE TABLE `manufacturers` (
`manufacturers_image` varchar(64) DEFAULT NULL,
PRIMARY KEY (`manufacturers_id`),
KEY `manufacturers_name` (`manufacturers_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1430,7 +1430,7 @@ CREATE TABLE `mrpplannedorders` (
`mrpdate` date DEFAULT NULL,
`updateflag` smallint(6) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1454,7 +1454,7 @@ CREATE TABLE `offers` (
KEY `offers_ibfk_2` (`stockid`),
CONSTRAINT `offers_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`),
CONSTRAINT `offers_ibfk_2` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1496,7 +1496,7 @@ CREATE TABLE `paymentmethods` (
`opencashdrawer` tinyint(4) NOT NULL DEFAULT '0',
`percentdiscount` double NOT NULL DEFAULT '0',
PRIMARY KEY (`paymentid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1668,27 +1668,27 @@ CREATE TABLE `pickinglists` (
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE pickreq (
- `prid` int not null auto_increment,
- `initiator` varchar(20) not null default '',
- `shippedby` varchar(20) not null default '',
- `initdate` date not null default '0000-00-00',
- `requestdate` date not null default '0000-00-00',
- `shipdate` date not null default '0000-00-00',
- `status` varchar(12) not null default '',
- `comments` text default null,
- `closed` tinyint not null default '0',
- `loccode` varchar(5) not null default '',
- `orderno` int not null default '1',
- `consignment` varchar(15) NOT NULL DEFAULT '',
- `packages` int(11) NOT NULL DEFAULT '1' COMMENT 'number of cartons',
- PRIMARY KEY (`prid`),
- key (`orderno`),
- key (`requestdate`),
- key (`shipdate`),
- key (`status`),
- key (`closed`),
- CONSTRAINT FOREIGN KEY(`loccode`) REFERENCES `locations`(`loccode`),
- constraint foreign key (`orderno`) REFERENCES salesorders(`orderno`)
+ `prid` int not null auto_increment,
+ `initiator` varchar(20) not null default '',
+ `shippedby` varchar(20) not null default '',
+ `initdate` date not null default '0000-00-00',
+ `requestdate` date not null default '0000-00-00',
+ `shipdate` date not null default '0000-00-00',
+ `status` varchar(12) not null default '',
+ `comments` text default null,
+ `closed` tinyint not null default '0',
+ `loccode` varchar(5) not null default '',
+ `orderno` int not null default '1',
+ `consignment` varchar(15) NOT NULL DEFAULT '',
+ `packages` int(11) NOT NULL DEFAULT '1' COMMENT 'number of cartons',
+ PRIMARY KEY (`prid`),
+ key (`orderno`),
+ key (`requestdate`),
+ key (`shipdate`),
+ key (`status`),
+ key (`closed`),
+ CONSTRAINT FOREIGN KEY(`loccode`) REFERENCES `locations`(`loccode`),
+ constraint foreign key (`orderno`) REFERENCES salesorders(`orderno`)
) Engine=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1699,19 +1699,19 @@ CREATE TABLE pickreq (
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE pickreqdetails (
- `detailno` int not null auto_increment,
- `prid` int not null default '1',
- `orderlineno` int not null default '0',
- `stockid` varchar(20) not null default '',
- `qtyexpected` double not null default '0',
- `qtypicked` double not null default '0',
- `invoicedqty` double not null default '0',
- `shipqty` double not null default '0',
- PRIMARY KEY (`detailno`),
- key (`prid`),
- constraint foreign key (`stockid`) REFERENCES stockmaster(`stockid`),
- constraint foreign key (`prid`) REFERENCES pickreq(`prid`)
-)Engine=InnoDB DEFAULT CHARSET=utf8;
+ `detailno` int not null auto_increment,
+ `prid` int not null default '1',
+ `orderlineno` int not null default '0',
+ `stockid` varchar(20) not null default '',
+ `qtyexpected` double not null default '0',
+ `qtypicked` double not null default '0',
+ `invoicedqty` double not null default '0',
+ `shipqty` double not null default '0',
+ PRIMARY KEY (`detailno`),
+ key (`prid`),
+ constraint foreign key (`stockid`) REFERENCES stockmaster(`stockid`),
+ constraint foreign key (`prid`) REFERENCES pickreq(`prid`)
+) Engine=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1721,18 +1721,18 @@ CREATE TABLE pickreqdetails (
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE pickserialdetails (
- `serialmoveid` int not null auto_increment,
- `detailno` int not null default '1',
- `stockid` varchar(20) not null default '',
- `serialno` varchar(30) not null default '',
- `moveqty` double not null default '0',
- PRIMARY KEY (`serialmoveid`),
- key (`detailno`),
- key (`stockid`,`serialno`),
- key (`serialno`),
- CONSTRAINT FOREIGN KEY (`detailno`) REFERENCES pickreqdetails (`detailno`),
- CONSTRAINT FOREIGN KEY (`stockid`,`serialno`) REFERENCES `stockserialitems`(`stockid`,`serialno`)
-)Engine=InnoDB DEFAULT CHARSET=utf8;
+ `serialmoveid` int not null auto_increment,
+ `detailno` int not null default '1',
+ `stockid` varchar(20) not null default '',
+ `serialno` varchar(30) not null default '',
+ `moveqty` double not null default '0',
+ PRIMARY KEY (`serialmoveid`),
+ key (`detailno`),
+ key (`stockid`,`serialno`),
+ key (`serialno`),
+ CONSTRAINT FOREIGN KEY (`detailno`) REFERENCES pickreqdetails (`detailno`),
+ CONSTRAINT FOREIGN KEY (`stockid`,`serialno`) REFERENCES `stockserialitems`(`stockid`,`serialno`)
+) Engine=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1883,7 +1883,7 @@ CREATE TABLE `purchorderdetails` (
KEY `ShiptRef` (`shiptref`),
KEY `Completed` (`completed`),
CONSTRAINT `purchorderdetails_ibfk_1` FOREIGN KEY (`orderno`) REFERENCES `purchorders` (`orderno`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -1935,7 +1935,7 @@ CREATE TABLE `purchorders` (
KEY `AllowPrintPO` (`allowprint`),
CONSTRAINT `purchorders_ibfk_1` FOREIGN KEY (`supplierno`) REFERENCES `suppliers` (`supplierid`),
CONSTRAINT `purchorders_ibfk_2` FOREIGN KEY (`intostocklocation`) REFERENCES `locations` (`loccode`)
-) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2133,7 +2133,7 @@ CREATE TABLE `reportheaders` (
`lower4` varchar(10) NOT NULL DEFAULT '',
PRIMARY KEY (`reportid`),
KEY `ReportHeading` (`reportheading`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2264,7 +2264,7 @@ CREATE TABLE `salesanalysis` (
KEY `BudgetOrActual` (`budgetoractual`),
KEY `Salesperson` (`salesperson`),
CONSTRAINT `salesanalysis_ibfk_1` FOREIGN KEY (`periodno`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2279,7 +2279,7 @@ CREATE TABLE `salescat` (
`salescatname` varchar(50) DEFAULT NULL,
`active` int(11) NOT NULL DEFAULT '1' COMMENT '1 if active 0 if inactive',
PRIMARY KEY (`salescatid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2334,7 +2334,7 @@ CREATE TABLE `salesglpostings` (
KEY `Area` (`area`),
KEY `StkCat` (`stkcat`),
KEY `SalesType` (`salestype`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2521,7 +2521,7 @@ CREATE TABLE `securityroles` (
`secroleid` int(11) NOT NULL AUTO_INCREMENT,
`secrolename` text NOT NULL,
PRIMARY KEY (`secroleid`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2561,7 +2561,7 @@ CREATE TABLE `sellthroughsupport` (
KEY `effectiveto` (`effectiveto`),
KEY `stockid` (`stockid`),
KEY `categoryid` (`categoryid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2621,7 +2621,7 @@ CREATE TABLE `shippers` (
`shippername` char(40) NOT NULL DEFAULT '',
`mincharge` double NOT NULL DEFAULT '0',
PRIMARY KEY (`shipper_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2666,7 +2666,7 @@ CREATE TABLE `stockcatproperties` (
PRIMARY KEY (`stkcatpropid`),
KEY `categoryid` (`categoryid`),
CONSTRAINT `stockcatproperties_ibfk_1` FOREIGN KEY (`categoryid`) REFERENCES `stockcategory` (`categoryid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2704,7 +2704,7 @@ CREATE TABLE `stockcounts` (
KEY `LocCode` (`loccode`),
CONSTRAINT `stockcounts_ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
CONSTRAINT `stockcounts_ibfk_2` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2836,7 +2836,7 @@ CREATE TABLE `stockmoves` (
CONSTRAINT `stockmoves_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `stockmoves_ibfk_3` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`),
CONSTRAINT `stockmoves_ibfk_4` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`)
-) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2881,7 +2881,7 @@ CREATE TABLE `stockrequest` (
KEY `departmentid` (`departmentid`),
CONSTRAINT `stockrequest_ibfk_1` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`),
CONSTRAINT `stockrequest_ibfk_2` FOREIGN KEY (`departmentid`) REFERENCES `departments` (`departmentid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -2922,12 +2922,10 @@ CREATE TABLE `stockserialitems` (
`expirationdate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`quantity` double NOT NULL DEFAULT '0',
`qualitytext` text NOT NULL,
- `createdate` DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`stockid`,`serialno`,`loccode`),
KEY `StockID` (`stockid`),
KEY `LocCode` (`loccode`),
KEY `serialno` (`serialno`),
- KEY `createdate` (`createdate`),
CONSTRAINT `stockserialitems_ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
CONSTRAINT `stockserialitems_ibfk_2` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2972,7 +2970,7 @@ CREATE TABLE `suppallocs` (
KEY `DateAlloc` (`datealloc`),
CONSTRAINT `suppallocs_ibfk_1` FOREIGN KEY (`transid_allocfrom`) REFERENCES `supptrans` (`id`),
CONSTRAINT `suppallocs_ibfk_2` FOREIGN KEY (`transid_allocto`) REFERENCES `supptrans` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3032,7 +3030,7 @@ CREATE TABLE `supplierdiscounts` (
KEY `effectivefrom` (`effectivefrom`),
KEY `effectiveto` (`effectiveto`),
KEY `stockid` (`stockid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3092,7 +3090,7 @@ CREATE TABLE `suppliertype` (
`typeid` tinyint(4) NOT NULL AUTO_INCREMENT,
`typename` varchar(100) NOT NULL,
PRIMARY KEY (`typeid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3131,7 +3129,7 @@ CREATE TABLE `supptrans` (
KEY `Type` (`type`),
CONSTRAINT `supptrans_ibfk_1` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
CONSTRAINT `supptrans_ibfk_2` FOREIGN KEY (`supplierno`) REFERENCES `suppliers` (`supplierid`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3176,7 +3174,7 @@ CREATE TABLE `tags` (
`tagref` tinyint(4) NOT NULL AUTO_INCREMENT,
`tagdescription` varchar(50) NOT NULL,
PRIMARY KEY (`tagref`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3199,7 +3197,7 @@ CREATE TABLE `taxauthorities` (
KEY `PurchTaxGLAccount` (`purchtaxglaccount`),
CONSTRAINT `taxauthorities_ibfk_1` FOREIGN KEY (`taxglcode`) REFERENCES `chartmaster` (`accountcode`),
CONSTRAINT `taxauthorities_ibfk_2` FOREIGN KEY (`purchtaxglaccount`) REFERENCES `chartmaster` (`accountcode`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3233,7 +3231,7 @@ CREATE TABLE `taxcategories` (
`taxcatid` tinyint(4) NOT NULL AUTO_INCREMENT,
`taxcatname` varchar(30) NOT NULL DEFAULT '',
PRIMARY KEY (`taxcatid`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3246,7 +3244,7 @@ CREATE TABLE `taxgroups` (
`taxgroupid` tinyint(4) NOT NULL AUTO_INCREMENT,
`taxgroupdescription` varchar(30) NOT NULL DEFAULT '',
PRIMARY KEY (`taxgroupid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3278,7 +3276,7 @@ CREATE TABLE `taxprovinces` (
`taxprovinceid` tinyint(4) NOT NULL AUTO_INCREMENT,
`taxprovincename` varchar(30) NOT NULL DEFAULT '',
PRIMARY KEY (`taxprovinceid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3343,7 +3341,7 @@ CREATE TABLE `unitsofmeasure` (
`unitid` tinyint(4) NOT NULL AUTO_INCREMENT,
`unitname` varchar(15) NOT NULL DEFAULT '',
PRIMARY KEY (`unitid`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -3490,7 +3488,7 @@ CREATE TABLE `www_users` (
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
@@ -8655,9 +8653,9 @@ INSERT INTO `config` VALUES ('DispatchCutOffTime','14');
INSERT INTO `config` VALUES ('DoFreightCalc','0');
INSERT INTO `config` VALUES ('EDIHeaderMsgId','D:01B:UN:EAN010');
INSERT INTO `config` VALUES ('EDIReference','WEBERP');
-INSERT INTO `config` VALUES ('EDI_Incoming_Orders','companies/test/EDI_Incoming_Orders');
-INSERT INTO `config` VALUES ('EDI_MsgPending','companies/test/EDI_Pending');
-INSERT INTO `config` VALUES ('EDI_MsgSent','companies/test/EDI_Sent');
+INSERT INTO `config` VALUES ('EDI_Incoming_Orders','companies/weberpdemo/EDI_Incoming_Orders');
+INSERT INTO `config` VALUES ('EDI_MsgPending','companies/weberpdemo/EDI_Pending');
+INSERT INTO `config` VALUES ('EDI_MsgSent','companies/weberpdemo/EDI_Sent');
INSERT INTO `config` VALUES ('ExchangeRateFeed','Google');
INSERT INTO `config` VALUES ('Extended_CustomerInfo','1');
INSERT INTO `config` VALUES ('Extended_SupplierInfo','1');
@@ -13944,6 +13942,7 @@ INSERT INTO `workorders` VALUES (37,'MEL','2016-10-19','2016-10-19',0,0,NULL,'',
INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','admin@weberp.org','MEL',8,1,'2017-12-05 18:46:18','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,1,1,0,50,'fluid','en_GB.utf8',0,0);
INSERT INTO `www_users` VALUES ('WEB0000021','$2y$10$aTt/treAhiVVd0mPw1Ums.GcOxBtX/3cIsD1RL//0iT3QUYjvIDlS','Phil Daintree','WEB0000021','','','1234564','phil@logicworks.co.nz','TOR',7,0,NULL,'WEB0000021','A4','1,0,0,0,0,0,0,0,0,0,0',0,1,1,0,30,'','en_GB.utf8',0,0);
+
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
diff --git a/sql/mysql/upgrade4.14.1-4.14.2.sql b/sql/mysql/upgrade4.14.1-4.14.2.sql
index 39f391b35..8311680fc 100644
--- a/sql/mysql/upgrade4.14.1-4.14.2.sql
+++ b/sql/mysql/upgrade4.14.1-4.14.2.sql
@@ -11,7 +11,7 @@ ALTER TABLE `pctabs` ADD COLUMN `authorizerexpenses` VARCHAR(20) NOT NULL AFTER
UPDATE `pctabs` SET authorizerexpenses=authorizer;
ALTER TABLE `pcashdetails` ADD COLUMN `tag` INT(11) NOT NULL DEFAULT 0 AFTER `tabcode`;
INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcAuthorizeCash.php', '6', 'Authorisation of assigned cash');
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_RemovePurchaseBackOrders.php', '1', 'Removes all purchase order back orders');
+INSERT IGNORE INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_RemovePurchaseBackOrders.php', '1', 'Removes all purchase order back orders');
CREATE TABLE `pcashdetailtaxes` (
`counterindex` INT(20) NOT NULL AUTO_INCREMENT,
`pccashdetail` INT(20) NOT NULL DEFAULT 0,
@@ -31,7 +31,7 @@ ALTER TABLE `custbranch` CHANGE `lng` `lng` FLOAT(12,8) NOT NULL DEFAULT '0.0000
ALTER TABLE pcashdetails MODIFY receipt text COMMENT 'Column redundant. Replaced by receipt file upload. Nov 2017.';
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('BankAccountBalances.php', '1', 'Shows bank accounts authorised for with balances');
-ALTER TABLE `stockserialitems` ADD `createdate` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, ADD INDEX ( `createdate` );
+ALTER TABLE `stockserialitems` ADD `createdate` timestamp NULL DEFAULT CURRENT_TIMESTAMP, ADD INDEX ( `createdate` );
UPDATE stockserialitems SET createdate = NULL;
UPDATE stockserialitems as stockserialitems SET createdate =
@@ -74,6 +74,7 @@ CREATE TABLE IF NOT EXISTS pickreq (
key (`shipdate`),
key (`status`),
key (`closed`),
+ key (`loccode`),
CONSTRAINT FOREIGN KEY(`loccode`) REFERENCES `locations`(`loccode`),
constraint foreign key (`orderno`) REFERENCES salesorders(`orderno`)
) Engine=InnoDB DEFAULT CHARSET=utf8;
@@ -89,6 +90,7 @@ CREATE TABLE IF NOT EXISTS pickreqdetails (
`shipqty` double not null default '0',
PRIMARY KEY (`detailno`),
key (`prid`),
+ key (`stockid`),
constraint foreign key (`stockid`) REFERENCES stockmaster(`stockid`),
constraint foreign key (`prid`) REFERENCES pickreq(`prid`)
) Engine=InnoDB DEFAULT CHARSET=utf8;