Merge branch 'master' into pic_filename

This commit is contained in:
i92guboj
2017-01-31 16:04:33 +01:00
committed by GitHub
38 changed files with 1516 additions and 897 deletions

View File

@@ -198,6 +198,8 @@ CREATE TABLE `ospos_items` (
`pic_filename` varchar(255) DEFAULT NULL,
`allow_alt_description` tinyint(1) NOT NULL,
`is_serialized` tinyint(1) NOT NULL,
`stock_type` TINYINT(2) NOT NULL DEFAULT 0,
`item_type` TINYINT(2) NOT NULL DEFAULT 0,
`deleted` int(1) NOT NULL DEFAULT '0',
`custom1` VARCHAR(25) NOT NULL,
`custom2` VARCHAR(25) NOT NULL,
@@ -246,6 +248,10 @@ CREATE TABLE `ospos_items_taxes` (
CREATE TABLE `ospos_item_kits` (
`item_kit_id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) NOT NULL,
`item_id` INT(10) NOT NULL DEFAULT 0,
`kit_discount_percent` DECIMAL(15,2) NOT NULL DEFAULT 0.00,
`price_option` TINYINT(2) NOT NULL DEFAULT 0,
`print_option` TINYINT(2) NOT NULL DEFAULT 0,
`description` varchar(255) NOT NULL,
PRIMARY KEY (`item_kit_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
@@ -265,6 +271,7 @@ CREATE TABLE `ospos_item_kit_items` (
`item_kit_id` int(11) NOT NULL,
`item_id` int(11) NOT NULL,
`quantity` decimal(15,3) NOT NULL,
`kit_sequence` INT(3) NOT NULL DEFAULT 0,
PRIMARY KEY (`item_kit_id`,`item_id`,`quantity`),
KEY `ospos_item_kit_items_ibfk_2` (`item_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -534,6 +541,7 @@ CREATE TABLE `ospos_sales_items` (
`item_unit_price` decimal(15,2) NOT NULL,
`discount_percent` decimal(15,2) NOT NULL DEFAULT '0',
`item_location` int(11) NOT NULL,
`print_option` TINYINT(2) NOT NULL DEFAULT 0,
PRIMARY KEY (`sale_id`,`item_id`,`line`),
KEY `sale_id` (`sale_id`),
KEY `item_id` (`item_id`),
@@ -626,6 +634,7 @@ CREATE TABLE `ospos_sales_suspended_items` (
`item_unit_price` decimal(15,2) NOT NULL,
`discount_percent` decimal(15,2) NOT NULL DEFAULT '0',
`item_location` int(11) NOT NULL,
`print_option` TINYINT(2) NOT NULL DEFAULT 0,
PRIMARY KEY (`sale_id`,`item_id`,`line`),
KEY `sale_id` (`sale_id`),
KEY `item_id` (`item_id`)