Merge branch 'refactor/edit_stock_locations'

Conflicts:
	application/controllers/config.php
	application/models/stock_locations.php
This commit is contained in:
jekkos-t520
2015-01-27 19:24:59 +01:00
5 changed files with 175 additions and 103 deletions

View File

@@ -656,7 +656,7 @@ CREATE TABLE `ospos_stock_locations` (
`location_name` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
`deleted` int(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`location_id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=0;
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
--
-- Dumping data for table `ospos_stock_locations`