Permalink
Browse files

Merge commit 'lgedgar/master' into v2.2_dev

  • Loading branch information...
2 parents 2b9ec9b + bfa2fc5 commit 5dc023fdc4a3fd7d917857320b787705dfb19178 @anon84 anon84 committed Apr 27, 2010
View
@@ -0,0 +1,3 @@
+*.pyc
+pos/is4c/ini/ini.php
+*~
@@ -3,13 +3,13 @@ use opdata;
DROP TABLE IF EXISTS `employees`;
CREATE TABLE `employees` (
`emp_no` smallint(6) default NULL,
- `CashierPassword` int(11) default NULL COMMENT 'The password the user will use to log into the cash register.',
- `AdminPassword` int(11) default NULL COMMENT 'Users with an Admin password can use it to approve some administrative tasks.',
+ `CashierPassword` int(11) default NULL comment 'The password the user will use to log into the cash register.',
+ `AdminPassword` int(11) default NULL comment 'Users with an Admin password can use it to approve some administrative tasks.',
`FirstName` varchar(255) default NULL,
`LastName` varchar(255) default NULL,
`JobTitle` varchar(255) default NULL,
- `EmpActive` tinyint(4) default NULL COMMENT '1 if the employee is active. 0 if they are inactive.',
- `frontendsecurity` smallint(6) default NULL COMMENT 'Defines the front-end security available to the user.',
- `backendsecurity` smallint(6) default NULL COMMENT 'Defines the front-end security available to the user.',
+ `EmpActive` tinyint(4) default NULL comment '1 if the employee is active. 0 if they are inactive.',
+ `frontendsecurity` smallint(6) default NULL comment 'Defines the front-end security available to the user.',
+ `backendsecurity` smallint(6) default NULL comment 'Defines the front-end security available to the user.',
KEY `emp_no` (`emp_no`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
File renamed without changes.

0 comments on commit 5dc023f

Please sign in to comment.