Commit Graph

1127 Commits

Author SHA1 Message Date
FrancescoUK
69b3e9db52 fix receiving form and detailed report (#116) 2016-03-26 22:55:06 +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
4e9731c59b Prevent user to update employee without selecting at least one grant
(#420)
2016-03-23 08:44:18 +01:00
jekkos
f9f127e227 Disable second tax field if first is not filled (#381)
Add extra warning if first tax is modified

Conflicts:

	application/views/items/form_bulk.php
2016-03-23 08:10:08 +01:00
FrancescoUK
96c4b57b18 Properly fix item search bug (remove duplicated rows due to left outer join) 2016-03-21 21:08:56 +00:00
jekkos
9cbbe111a7 Set correct branchname for Dockerfile (#284, #114) 2016-03-21 21:47:32 +01:00
jekkos
fbd7465b03 Remove sync ajax calls in validation callback for forms (#413)
Remove jquery-bgiframe (not used anynmore) (#328)
2016-03-21 21:27:46 +01:00
FrancescoUK
fda45dd363 fix bulk_edit: don't remove supplier if none is selected, save category, removed confirm dialog (#393) 2016-03-21 19:02:53 +00:00
FrancescoUK
b72432a39e Add in README.md that vs 3.0.0 requires PHP 5.5 or greater (#416) 2016-03-21 13:48:38 +00:00
Aaron Gong
cb26c8cf33 Fix for #393 - issue with bulk edit (PR #415) 2016-03-21 08:44:59 +01:00
FrancescoUK
3a4e9d9107 remove JQmigrate, update plugins, regen dist files, manual fix of template header (#328) 2016-03-20 22:21:48 +00:00
FrancescoUK
06420fa4b0 fix width % in table_helper to be 100% max (#116) 2016-03-20 22:14:06 +00:00
FrancescoUK
b57fc1f34d add rule to .htaccess to protect generate_language.php (#311) 2016-03-20 19:10:36 +00:00
FrancescoUK
f813780e15 Replace custom csv parse function with PHP builtin (>=5.3) (#311) 2016-03-18 17:25:09 +00:00
FrancescoUK
20fc9138e2 sanity check of post & get on item suggestion and search (#402) 2016-03-17 20:16:56 +00:00
FrancescoUK
18857aca46 fix file language issues: remove \ from French, retranslate everything but manually fix id issues with \" (#311) 2016-03-17 18:36:12 +00:00
jekkos
38a2fb4ca1 Remove call to flushCache (gone after tablesorter upgrade) (#328) 2016-03-17 08:14:10 +01:00
jekkos
a04b1d5803 Fix jQuery deprecation warning in invoice load (#328)
Ignore giftcard test as it makes build unstable
2016-03-16 08:13:08 +01:00
FrancescoUK
06e7dcd471 fix header of pagination.php (#116) 2016-03-15 19:10:24 +00:00
FrancescoUK
d4dae9fd32 bootstrapify pagination links, remove old styling, don't print links in takings, change <?= to be <?php (#116, #394) 2016-03-15 19:08:14 +00:00
FrancescoUK
e3a10067f5 fix the missing jsPrint takings_printer in config (#394) 2016-03-15 18:09:37 +00:00
jekkos
126f2254f6 Make invoice header responsive, remove fixed height and make font size
relative. (#116)
2016-03-15 17:49:10 +01:00
jekkos
64c7eb28b3 Put back form submit buttons (#328)
Add custom style for jquery autocomplete widgets (#116)
2016-03-14 23:11:25 +01:00
FrancescoUK
5e97358e90 enable jsPrint in receipt, invoice and Takings (sales/manage) (#394) 2016-03-14 19:54:46 +00:00
FrancescoUK
eb838cdb9f Change table links to be glyphicons, fix tooltips sentence in sales/manage, fix sortable columns (#116) 2016-03-14 18:40:07 +00:00
FrancescoUK
983dad87af regenerate dist file (#394) 2016-03-14 17:21:50 +00:00
FrancescoUK
87853f0da4 add navigation buttons in sales receipt and invoice, fix invoice styling (#394) 2016-03-14 17:21:28 +00:00
jekkos
e8e89f1c7e Add workaround for jQuery load deprecation (#328) 2016-03-14 08:49:52 +01:00
FrancescoUK
f6be7cdf23 Merge branch 'master' into bootstrapUI 2016-03-13 16:19:44 +00:00
FrancescoUK
7937e880c0 Merge branch 'ais-one-master' 2016-03-13 15:30:40 +00:00
FrancescoUK
c52b5b5118 hide links, change print button id and add it to stylesheet, hide the print div (#160) 2016-03-13 15:29:39 +00:00
FrancescoUK
e47e80c69c Merge branch 'master' of git://github.com/ais-one/opensourcepos into ais-one-master 2016-03-13 14:39:37 +00:00
Aaron Gong
6208569c7e Fix for issue 160
https://github.com/jekkos/opensourcepos/issues/160

I try to interfere as little as possible
2016-03-13 22:04:39 +08:00
FrancescoUK
1a41c6a360 remove unused legend strings (removed from forms) (#116) 2016-03-13 13:43:09 +00:00
FrancescoUK
38d52e4df0 remove unnecessary and redundant messages from report listing view (#116) 2016-03-13 12:42:17 +00:00
FrancescoUK
1f56a8da8c fix feature/bootstrapUI Reports issue with today date selection (#395) 2016-03-13 12:38:52 +00:00
FrancescoUK
4ad0d62f42 Upgrade to CI3.0.5 (#292) 2016-03-13 11:26:51 +00:00
FrancescoUK
0bd5bbec77 remove encode/decode base64 causing issues with web hosting providers (#374) 2016-03-13 10:52:32 +00:00
FrancescoUK
340792cfc2 change "E-mail" to be "email" (#116) 2016-03-13 10:07:59 +00:00
FrancescoUK
a817c8ae0a simplify checkbox logic in sales/register and receiving (#116) 2016-03-12 11:25:23 +00:00
FrancescoUK
c124c08f89 readded bootstrap-select and adjusted styling of dropboxes (#116) 2016-03-12 10:57:24 +00:00
FrancescoUK
d2565009d8 fix wrong behaviour with due amount and Complete button on "sale" <=0 and "return" >=0 (#116) 2016-03-12 09:23:54 +00:00
FrancescoUK
b38a5ca47a bootstrapisation of receivings (#116) 2016-03-12 00:03:54 +00:00
FrancescoUK
f32bba31b5 fix sales/register return, make complete replacing add payment button on 0 amount due, remove pop up on complete and suspend (#116) 2016-03-11 21:55:31 +00:00
FrancescoUK
4b8f505625 reenable pop dialogs for confirmation, disable add payment button when amount due is 0 (#116) 2016-03-11 18:04:44 +00:00