Commit Graph

1184 Commits

Author SHA1 Message Date
FrancescoUK
923f0e05fc update bower file to contain correct tablesorter version 2016-04-03 19:35:19 +01:00
FrancescoUK
c981bc7daa update tablesorter to 2.25.7, regenerate dist files even to fix database.sql 2016-04-03 19:33:09 +01:00
FrancescoUK
fc6c9f6d57 set correct git path in Dockerfile 2016-04-03 18:18:13 +01:00
FrancescoUK
bca943bf34 Fix README.md 2016-04-02 19:21:20 +01:00
FrancescoUK
49366ea5ab Merge branch 'bootstrapUI' into master (now vs 3.0.0) 2016-04-02 19:17:32 +01:00
FrancescoUK
44dfb86230 Merge branch 'master' vs 2.4 into bootstrapUI 2016-04-02 18:58:42 +01:00
FrancescoUK
f36e5ecef4 Release files update (due to 2.4 being released) 2016-04-02 14:22:36 +01:00
FrancescoUK
afcb1641b7 Added decimals to taxes (#327), added totals rounding matching decimals (#327 #307, #429) 2016-04-02 13:59:01 +01:00
FrancescoUK
54455213a8 Release files update 2.4.0 2016-04-02 09:33:37 +01:00
FrancescoUK
dda468291a Update codeigniter_version.txt to contain 3.0.5 (#292)
change the order of access prevent in .htaccess
2016-04-01 22:17:13 +01:00
FrancescoUK
3d7756f177 Update codeigniter_version.txt to contain 3.0.5 (#292) 2016-04-01 22:00:28 +01:00
FrancescoUK
c5037c5725 add currency decimals configuration, fix quantity decimals in forms, merged helpers in locale one (#307 #429) 2016-04-01 21:07:29 +01:00
jekkos
bef7a2da25 Add release notes for 2.4 2016-04-01 18:43:05 +02:00
jekkos
12f4209055 Add hungarian (hu-HU) language (#438) 2016-04-01 16:52:07 +02:00
FrancescoUK
76ff5da718 fix error on new item (#429) 2016-04-01 08:45:57 +01:00
FrancescoUK
19bdcad78e fix database conversion script missing ; at the end (#429) 2016-04-01 08:10:47 +01:00
FrancescoUK
6efdccfef0 add configurable quantity decimals (#429) 2016-04-01 00:07:05 +01:00
FrancescoUK
97676f01a2 change quantity fields to be decimal(15,3) in database (#429) 2016-03-31 20:54:37 +01:00
FrancescoUK
affefb44b4 Resize Item_kits and Items forms quantity fields to space for 3 decimals (#429) 2016-03-31 20:12:56 +01:00
FrancescoUK
62dea44922 add currency symbol in front of gift card value (#116) 2016-03-31 18:52:42 +01:00
FrancescoUK
da5c821de3 tidy up of old styles, make login to use standard bootstrap, regen dist (#116) 2016-03-31 18:25:17 +01:00
FrancescoUK
b2597df44c replaced float_left with pull-left and float_right with pull-right (#116 #293) 2016-03-31 17:35:42 +01:00
FrancescoUK
c8f6f6adf0 remove code submitted accidentally (#116 #293) 2016-03-31 17:08:34 +01:00
FrancescoUK
83edcaf955 set the filters in Items and Sales/Takings on the right side (#116 #293) 2016-03-31 16:33:30 +01:00
FrancescoUK
2359af5fbb tune dropdowns style and font size (#116 #293) 2016-03-31 15:20:30 +01:00
jekkos
e3ddea07b9 Remove F-key shortcuts for modules (#425)
Conflicts:

	application/views/partial/header.php
	dist/opensourcepos.min.js
2016-03-31 08:13:13 +02:00
jekkos
953307cbc7 Remove F-key shortcuts for modules (#425) 2016-03-31 08:08:12 +02:00
FrancescoUK
f303066039 fix missing refresh of payment totals on filter selection (#116 #293) 2016-03-30 22:28:29 +01:00
FrancescoUK
22e38b6f2a bootstrapified and completed rework of the filters section in Sales/Takings (#116 #293) 2016-03-30 22:13:17 +01:00
FrancescoUK
68f5e73bff tidy up js leftovers (#116 #293) 2016-03-30 18:31:47 +01:00
FrancescoUK
086d5b39f3 bootstrapified and complete rework of the filters section in Items (#116 #293) 2016-03-30 18:10:42 +01:00
FrancescoUK
97d17da8c0 Fix error message when searching for non existing supplier in receivings (#430) 2016-03-29 17:31:59 +01:00
jekkos
4d04cdd65f Fix error message when searching for nonexistant supplier in receivings
(#430)
2016-03-29 17:41:16 +02:00
FrancescoUK
7d9013cb2d Fix error message when searching for non existing customer in sales (#430) 2016-03-29 09:24:58 +01:00
FrancescoUK
d996ff29cb Regenerate invoice number on sale unsuspend if no custom format is used (#423) 2016-03-29 09:21:43 +01:00
jekkos
51b776354a Fix error message when searching for nonexistant customer in sales
(#430)
2016-03-29 08:43:58 +02:00
jekkos
d51d1b458a Regenerate invoice number on sale unsuspend if no custom format is used
(#423)
2016-03-29 08:29:43 +02:00
FrancescoUK
7f44d379f5 removed redundant page titles, moved pagination up, adjusted styles, regen dist (#116) 2016-03-26 22:56:51 +00:00
FrancescoUK
69b3e9db52 fix receiving form and detailed report (#116) 2016-03-26 22:55:06 +00:00
FrancescoUK
faac1d6a10 fix bulk_edit: don't remove category, supplier and taxes if left empty; save when a value is set (#393 #381) 2016-03-26 15:12:51 +00:00
FrancescoUK
2f5fd8e3d0 Set tax rate name & % in bulk edit to be the config one, save only if not empty (#381) 2016-03-26 14:03:08 +00:00
FrancescoUK
972f0e81f4 change edit in sales/register and receiving to be a glyphicon with update label (#405 #116) 2016-03-26 10:55:07 +00:00
FrancescoUK
1e85edfef4 change sales/register and receiving button edit item to be update 2016-03-25 22:17:27 +00:00
FrancescoUK
50e6739bad add print and items receiving button in receiving receipt (#426) 2016-03-25 22:09:58 +00:00
FrancescoUK
2322682014 update bootstrap-dialog, remove jqmigrate, regen dist files (#328) 2016-03-25 21:40:09 +00:00
FrancescoUK
16f438dea2 fix "$ is undefined" in login page (#328 #329) 2016-03-25 20:53:30 +00:00
jekkos
6ffec444d6 show serialnumber and description on invoice underneath name and qty
resp. (#405)
2016-03-23 18:44:15 +01:00
jekkos
4e9731c59b Prevent user to update employee without selecting at least one grant
(#420)
2016-03-23 08:44:18 +01:00
jekkos
4f3a845702 Prevent user to update employee without selecting at least one grant
(#420)
2016-03-23 08:38:13 +01:00
jekkos
a3af051d43 Minor improvements for sales tax bulk edit (#381) 2016-03-23 08:14:15 +01:00