mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-12 02:48:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/sale_numbering'

Browse Source 
Conflicts:
	application/libraries/Receiving_lib.php
	database/2.3_to_2.3.1.sql
	js/manage_tables.js
This commit is contained in:
jekkos-t520
2014-11-25 17:20:05 +01:00
parent 5a40c31af3 4893da0e43
commit 97d37b5ad9
25 changed files with 757 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
database/database.sql
View File

@@ -38,7 +38,11 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('timezone', 'America/New_York'),
('website', ''),
('recv_invoice_format', ''),
('tax_included', '0');
('sales_invoice_format', ''),
('tax_included', '0'),
('recv_invoice_enable', '1'),
('sales_invoice_enable', '1');
-- --------------------------------------------------------
@@ -445,11 +449,13 @@ CREATE TABLE `ospos_sales` (
`customer_id` int(10) DEFAULT NULL,
`employee_id` int(10) NOT NULL DEFAULT '0',
`comment` text NOT NULL,
`invoice_number` varchar(32) DEFAULT NULL,
`sale_id` int(10) NOT NULL AUTO_INCREMENT,
`payment_type` varchar(512) DEFAULT NULL,
PRIMARY KEY (`sale_id`),
KEY `customer_id` (`customer_id`),
KEY `employee_id` (`employee_id`)
KEY `employee_id` (`employee_id`),
UNIQUE KEY `invoice_number` (`invoice_number`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
--
@@ -537,11 +543,13 @@ CREATE TABLE `ospos_sales_suspended` (
`customer_id` int(10) DEFAULT NULL,
`employee_id` int(10) NOT NULL DEFAULT '0',
`comment` text NOT NULL,
`invoice_number` varchar(32) DEFAULT NULL,
`sale_id` int(10) NOT NULL AUTO_INCREMENT,
`payment_type` varchar(512) DEFAULT NULL,
PRIMARY KEY (`sale_id`),
KEY `customer_id` (`customer_id`),
KEY `employee_id` (`employee_id`)
KEY `employee_id` (`employee_id`),
UNIQUE KEY `invoice_number` (`invoice_number`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
--