Fixed newlines in js submit dialogs.

[fa-stable.git] / sql / en_US-new.sql

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 66ad32f472a3c7b656267c035b31b5eecaee8b1f..9864121a9fb4f0b821acf9debf497e435bf552ca 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -104,7 +104,6 @@ CREATE TABLE `0_bank_trans` (
   `bank_act` varchar(11) default NULL,
   `ref` varchar(40) default NULL,
   `trans_date` date NOT NULL default '0000-00-00',
-  `bank_trans_type_id` int(10) unsigned default NULL,
   `amount` double default NULL,
   `dimension_id` int(11) NOT NULL default '0',
   `dimension2_id` int(11) NOT NULL default '0',
@@ -1118,6 +1117,7 @@ DROP TABLE IF EXISTS `0_sales_order_details`;
 CREATE TABLE `0_sales_order_details` (
   `id` int(11) NOT NULL auto_increment,
   `order_no` int(11) NOT NULL default '0',
+  `trans_type` smallint(6) NOT NULL default '30',
   `stk_code` varchar(20) NOT NULL default '',
   `description` tinytext,
   `qty_sent` double NOT NULL default '0',
@@ -1138,10 +1138,12 @@ DROP TABLE IF EXISTS `0_sales_orders`;
 
 CREATE TABLE `0_sales_orders` (
   `order_no` int(11) NOT NULL auto_increment,
+  `trans_type` smallint(6) NOT NULL default '30',
   `version` tinyint(1) unsigned NOT NULL default '0',
   `type` tinyint(1) NOT NULL default '0',
   `debtor_no` int(11) NOT NULL default '0',
   `branch_code` int(11) NOT NULL default '0',
+  `reference` varchar(100) NOT NULL default '',
   `customer_ref` tinytext NOT NULL,
   `comments` tinytext,
   `ord_date` date NOT NULL default '0000-00-00',
@@ -1154,8 +1156,8 @@ CREATE TABLE `0_sales_orders` (
   `freight_cost` double NOT NULL default '0',
   `from_stk_loc` varchar(5) NOT NULL default '',
   `delivery_date` date NOT NULL default '0000-00-00',
-  PRIMARY KEY  (`order_no`)
-) TYPE=InnoDB  AUTO_INCREMENT=1 ;
+  PRIMARY KEY  (`trans_type`, `order_no`)
+) TYPE=InnoDB;
 
 
 ### Data of table `0_sales_orders` ###
@@ -1476,7 +1478,6 @@ DROP TABLE IF EXISTS `0_sys_types`;
 
 CREATE TABLE `0_sys_types` (
   `type_id` smallint(6) NOT NULL default '0',
-  `type_name` varchar(60) NOT NULL default '',
   `type_no` int(11) NOT NULL default '1',
   `next_reference` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`type_id`)
@@ -1485,27 +1486,28 @@ CREATE TABLE `0_sys_types` (
 
 ### Data of table `0_sys_types` ###
 
-INSERT INTO `0_sys_types` VALUES ('0', 'Journal - GL', '17', '1');
-INSERT INTO `0_sys_types` VALUES ('1', 'Payment - GL', '7', '1');
-INSERT INTO `0_sys_types` VALUES ('2', 'Receipt - GL', '4', '1');
-INSERT INTO `0_sys_types` VALUES ('4', 'Funds Transfer', '3', '1');
-INSERT INTO `0_sys_types` VALUES ('10', 'Sales Invoice', '16', '1');
-INSERT INTO `0_sys_types` VALUES ('11', 'Credit Note', '2', '1');
-INSERT INTO `0_sys_types` VALUES ('12', 'Receipt', '6', '1');
-INSERT INTO `0_sys_types` VALUES ('13', 'Delivery', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('16', 'Location Transfer', '2', '1');
-INSERT INTO `0_sys_types` VALUES ('17', 'Inventory Adjustment', '2', '1');
-INSERT INTO `0_sys_types` VALUES ('18', 'Purchase Order', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('20', 'Supplier Invoice', '6', '1');
-INSERT INTO `0_sys_types` VALUES ('21', 'Supplier Credit Note', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('22', 'Supplier Payment', '3', '1');
-INSERT INTO `0_sys_types` VALUES ('25', 'Purchase Order Delivery', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('26', 'Work Order', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('28', 'Work Order Issue', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('29', 'Work Order Production', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('30', 'Sales Order', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('35', 'Cost Update', '1', '1');
-INSERT INTO `0_sys_types` VALUES ('40', 'Dimension', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('0', '17', '1');
+INSERT INTO `0_sys_types` VALUES ('1', '7', '1');
+INSERT INTO `0_sys_types` VALUES ('2', '4', '1');
+INSERT INTO `0_sys_types` VALUES ('4', '3', '1');
+INSERT INTO `0_sys_types` VALUES ('10', '16', '1');
+INSERT INTO `0_sys_types` VALUES ('11', '2', '1');
+INSERT INTO `0_sys_types` VALUES ('12', '6', '1');
+INSERT INTO `0_sys_types` VALUES ('13', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('16', '2', '1');
+INSERT INTO `0_sys_types` VALUES ('17', '2', '1');
+INSERT INTO `0_sys_types` VALUES ('18', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('20', '6', '1');
+INSERT INTO `0_sys_types` VALUES ('21', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('22', '3', '1');
+INSERT INTO `0_sys_types` VALUES ('25', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('26', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('28', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('29', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('30', '0', '1');
+INSERT INTO `0_sys_types` VALUES ('32', '0', '1');
+INSERT INTO `0_sys_types` VALUES ('35', '1', '1');
+INSERT INTO `0_sys_types` VALUES ('40', '1', '1');
 
 
 ### Structure of table `0_tax_group_items` ###
@@ -1599,7 +1601,7 @@ CREATE TABLE `0_users` (
   `user_id` varchar(60) NOT NULL default '',
   `password` varchar(100) NOT NULL default '',
   `real_name` varchar(100) NOT NULL default '',
-  `full_access` int(11) NOT NULL default '1',
+  `role_id` int(11) NOT NULL default '1',
   `phone` varchar(30) NOT NULL default '',
   `email` varchar(100) default NULL,
   `language` varchar(20) default NULL,