jekkos 139100db35 Merge branch 'master' into feature/bootstrap-tables ...

Conflicts:
	application/models/Item.php
	application/views/reports/date_input_excel_export.php
	application/views/reports/excel_export.php
	application/views/reports/inventory_summary_input.php
	application/views/reports/specific_input.php

2016-05-12 20:34:24 +02:00

..

barcodes

remove extra barcode font styling, set directly the correct size as of barcode_config (#116)

2016-03-09 14:24:16 +00:00

configs

Fix missing translation (#472), add glyphicons

2016-05-01 22:11:38 +01:00

customers

Show invoice icon if invoices enabled in config (#507)

2016-05-03 18:09:58 +02:00

employees

Enable bootstrap tables in employees module (#293)

2016-05-03 08:08:13 +02:00

errors

Upgrade to Code Igniter 3.0.3 (#120)

2016-03-08 17:41:16 +00:00

giftcards

Fix sale and receiving edit and delete in detailed report (#507, #293)

2016-05-11 17:57:37 +02:00

item_kits

Fix sale and receiving edit and delete in detailed report (#507, #293)

2016-05-11 17:57:37 +02:00

items

Fix sale and receiving edit and delete in detailed report (#507, #293)

2016-05-11 17:57:37 +02:00

messages

Rebase with latest master (#293, #472)

2016-05-03 08:58:11 +02:00

partial

Merge branch 'master' into feature/bootstrap-tables

2016-05-12 20:34:24 +02:00

people

Fix customer delete (use same uniqueId for these tables) (#552)

2016-05-12 19:40:12 +02:00

receivings

Search for item number if enter is hit in register and receiving (#507)

2016-05-12 08:36:23 +02:00

reports

Fix inventory summary report (#540)

2016-05-11 21:51:54 +02:00

sales

Search for item number if enter is hit in register and receiving (#507)

2016-05-12 08:36:23 +02:00

suppliers

Enable bootstrap-tables for suppliers module (#293)

2016-05-03 08:10:35 +02:00

home.php

Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css (#116)

2016-02-08 19:30:26 +00:00

index.html

Complete CI 3.0.3 upgrade since it wasn't done in full (#120)

2016-03-08 17:44:59 +00:00

login.php

Full delete refresh issue fix (table will fully refresh in the end)

2016-05-12 20:23:21 +02:00

no_access.php

Add route for no_access controller with just one parameter

2015-01-25 15:46:42 +01:00