jekkos fd87c59492 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI ...

Conflicts:
	application/views/partial/header.php
	application/views/receivings/receiving.php
	application/views/sales/register.php
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php

2016-02-27 18:55:44 +01:00

..

reports

Fix reports error due to report.php now being Report.php (#120)

2016-01-07 19:09:53 +00:00

Appconfig.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Customer.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Employee.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Giftcard.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

index.html

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

2016-01-07 20:16:59 +00:00

Inventory.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Item_kit_items.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Item_kit.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Item_quantity.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Item_taxes.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Item.php

Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI

2016-02-27 18:55:44 +01:00

Module.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Person.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Receiving.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Sale_suspended.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Sale.php

select transaction in Takings inclusive of time, fix Sale edit form to use bootstrap-datetimepicker (#116)

2016-02-14 22:41:10 +00:00

Stock_location.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00

Supplier.php

Upgrade to Code Igniter 3.0.3 (#120)

2016-01-07 19:06:35 +00:00