307 Commits

Author	SHA1	Message	Date
FrancescoUK	09831faaf4	Fix reports listing font size (#116)	2016-02-07 23:16:54 +00:00
FrancescoUK	a5e66eabed	Fix reports listing missing </div> issue (#116)	2016-02-07 23:11:27 +00:00
FrancescoUK	25f8a34b23	Change buttons in all the forms to use bootstrap button class (#116)	2016-02-07 23:04:59 +00:00
FrancescoUK	2ea14273b8	Merge branch 'ci3' into bootstrapUI	2016-02-07 18:07:54 +00:00
FrancescoUK	445222bcdd	Merge branch 'master' into ci3	2016-02-07 18:03:44 +00:00
FrancescoUK	345d2d95d8	Remove dbbackup on logout (#318)	2016-02-05 18:42:04 +00:00
FrancescoUK	8698026e86	Fix indentation	2016-01-28 09:32:46 +00:00
FrancescoUK	ec5d0ab4f7	Merge branch 'ci3' into bootstrapUI	2016-01-28 09:31:19 +00:00
FrancescoUK	3425920cb6	Merge branch 'master' into ci3	2016-01-28 09:05:35 +00:00
jekkos	847c4a67c9	Add integration test for making sale (#305)	2016-01-26 20:27:07 +01:00
FrancescoUK	342b889371	Merge branch 'ci3' into bootstrapUI	2016-01-25 09:44:08 +00:00
FrancescoUK	8e5b8712c0	Merge branch 'master' into ci3	2016-01-25 09:20:04 +00:00
jekkos	2520970698	Fix comment for autogenerated sql files (#301, #258)	2016-01-25 08:42:15 +01:00
FrancescoUK	f52c5b0843	Add a live clock functionality to flatly and spacelab templates (#298) (#116)	2016-01-24 22:57:13 +00:00
FrancescoUK	d48dc8b87b	Merge branch 'master' into ci3	2016-01-24 22:44:45 +00:00
FrancescoUK	8f72756737	Add a live clock functionality (#298) fix Gruntfile.js (#297)	2016-01-24 22:34:05 +00:00
FrancescoUK	4fd7948987	Made flatly as default, various header adjustments, added login with bootstrap (#116)	2016-01-24 20:05:36 +00:00
FrancescoUK	4ccab6b8b5	Code reformatting (#296)	2016-01-24 10:27:41 +00:00
FrancescoUK	1849ee807c	Add favicon (#296)	2016-01-24 10:27:15 +00:00
cpl2015	d9e18551b5	Update receiving.php	2016-01-24 02:52:22 +05:30
cpl2015	216432f4b6	Update manage.php	2016-01-24 01:38:02 +05:30
cpl2015	2b5825f841	Update form.php	2016-01-24 01:34:59 +05:30
cpl2015	46987845b3	Update form.php	2016-01-24 01:34:12 +05:30
cpl2015	e1cead8241	Update form.php	2016-01-24 01:30:49 +05:30
cpl2015	63f72b046d	Update receiving.php	2016-01-24 01:24:14 +05:30
cpl2015	3fe39bbf73	Update register.php	2016-01-24 01:19:50 +05:30
FrancescoUK	206751de0e	Overriding view files (#116)	2016-01-22 22:17:29 +00:00
FrancescoUK	4dd3c64e9d	Code reformatting	2016-01-22 22:16:50 +00:00
FrancescoUK	b400393a90	Code reformatting	2016-01-22 22:14:42 +00:00
FrancescoUK	1f9cb92697	Add favicon	2016-01-22 19:14:57 +00:00
FrancescoUK	59fe366479	Add favicon	2016-01-22 19:05:07 +00:00
FrancescoUK	dce413631c	Make NULL to be null all over the code for consistency purposes (#120)	2016-01-16 22:08:43 +00:00
FrancescoUK	a3929d2c6f	Merge remote-tracking branch 'jekkos/master' into ci3 ... # Conflicts: # application/config/database.php.tmpl	2016-01-15 18:57:11 +00:00
jekkos	2d0b20499e	Set correct locale for Dutch (Belgium)	2016-01-11 18:53:57 +01:00
FrancescoUK	5b01e60ed2	Merge branch 'master' #274 change into ci3	2016-01-10 13:13:55 +00:00
jekkos	26ff81ab71	Generate languages for German (Swiss) #274	2016-01-09 17:29:57 +01:00
Thorsten	da3349765a	Add de_CH language (by nano-riff #274)	2016-01-09 16:46:00 +01:00
FrancescoUK	1f86842757	Complete CI 3.0.3 upgrade since it wasn't done in full (#120)	2016-01-07 20:16:59 +00:00
Toni Haryanto	d8057830c6	Upgrade to Code Igniter 3.0.3 (#120)	2016-01-07 19:06:35 +00:00
jekkos	4ddde65b41	Bump version to 2.3.4 ... Update dutch translation for company_name Fix timeformat for date filtering in items module	2016-01-07 19:53:52 +01:00
jekkos	9e2d89c528	Show discounted price instead of discount itself on receipt	2016-01-04 17:19:50 +01:00
jekkos	1601d679fd	Takings not using proper permission (#262)	2016-01-04 17:04:33 +01:00
jekkos	1779685d31	Encode text before storing it as session variable (#254)	2015-12-30 08:10:14 +01:00
jekkos	da25281df9	Show discounted price per item line	2015-12-26 15:21:54 +01:00
jekkos	eb63f49db7	Add barcode generation for EAN8 and EAN13 (#111, #246) ... Add config option to use generation when generating barcodes for an Generate propery barcode with configured format if item_number empty	2015-12-26 11:42:58 +01:00
jekkos	9f5782e0ba	Add validation for barcode types (#111, #246) ... Fallback to code128 if invalid EAN8 or EAN13 is detected	2015-12-13 15:51:25 +01:00
jekkos	fb924daa81	Show reoder level in items form when editing (#241)	2015-12-04 18:13:05 +01:00
jekkos	1bb9acdc37	Fix for adding/deleting stock locations (#242)	2015-12-04 18:09:51 +01:00
jekkos	bc85391734	Submit form when hitting enter in search field for items module (#187)	2015-11-09 11:15:42 +01:00
jekkos	c0303cc873	Merge branch 'master' of https://github.com/asakpke/RoshanTech.com-POS	2015-10-20 22:01:37 +02:00