Commit Graph
1094 Commits
Author SHA1 Message Date
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
FrancescoUK 4433edc552 regenerate dist files (#116) 2016-03-11 17:49:05 +00:00
FrancescoUK 019f93d98b create style class for table width and first_li, regenerate dist files (#116) 2016-03-11 17:26:11 +00:00
FrancescoUK 98ebe1ff96 update daterangepicker to 2.1.19 and regen dist files (#116) 2016-03-11 17:24:51 +00:00
FrancescoUK 69c1af586e relayout of sales/register right panel to follow a more logical flow (#116) 2016-03-11 17:23:32 +00:00
FrancescoUK 2df8645c5f code comments, various bits and bobs (#116) 2016-03-11 17:20:07 +00:00
jekkos f6b9ef16d0 Add default jquery ui theme instead of smoothness theme (#328)
Remove obsolete ajax queue plugin (#328)
Add image preview widget for avatar upload in items form (#372)
2016-03-11 18:07:41 +01:00
jekkos 399cc38eb9 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 2016-03-10 21:29:04 +01:00
jekkos 652702f582 Fix delete button + image upload widget refresh for company logo (#372) 2016-03-10 21:28:37 +01:00
FrancescoUK 4913ffe114 regenerate dist files (but issue with search dropdown style) (#116) 2016-03-10 20:16:05 +00:00
FrancescoUK 668cd8d0f9 make sales/register dropdowns the standard style (#116) 2016-03-10 19:21:54 +00:00
FrancescoUK 05a1dd561c sales/register alignments, added customer info (#116, #369) 2016-03-10 19:21:54 +00:00
FrancescoUK 5f0c9c282c remove inline styling from page titles (if needed can be done from a .css file against #page_title) (#116) 2016-03-10 19:21:54 +00:00
FrancescoUK de825f54e7 remove ':' from sales/register labels (#116) 2016-03-10 19:21:54 +00:00
FrancescoUK 940a899231 more adjustments to sales/register bootstrapisation (#116) 2016-03-10 19:21:54 +00:00
FrancescoUK 70938f7b41 sales/register bootstrapisation (#116) 2016-03-10 19:20:42 +00:00
jekkos d510ab031d Update README.md with FAQ and answer to common setup problem (#387, #97, 2016-03-10 08:43:07 +01:00
jekkos 9c39f62b1e Fix sale search form submission on enter (#386)
Add php5-apcu to Dockerfile (#320, 284)
Fix countrycode parameter for nominatim address lookup
2016-03-10 08:25:32 +01:00
jekkos e175a96acb Fix nominatim address lookup with jquery ui autcomplete (#328)
Add dblclick event handler to item + customer autocomplete in register
2016-03-09 20:03:05 +01:00
FrancescoUK 71a8dce949 regenerate dist files (but issue with search dropdown style) (#328) 2016-03-09 17:10:47 +00:00
FrancescoUK 747706e032 fix barcode font size default in database.sql (#116) 2016-03-09 17:09:19 +00:00
FrancescoUK 2a679ca2eb set the correct default barcode font size (#116) 2016-03-09 16:53:17 +00:00
FrancescoUK 1f1b9c47ec remove extra barcode font styling, set directly the correct size as of barcode_config (#116) 2016-03-09 14:24:16 +00:00
FrancescoUK ceac184c30 add comment about barcodes (#116) 2016-03-09 14:00:27 +00:00
FrancescoUK f9803cb4f5 move barcode_sheet.php to views/barcode dir (#116) 2016-03-09 13:41:30 +00:00
FrancescoUK 626667b3fd Merge branch 'master' into bootstrapUI 2016-03-08 22:42:03 +00:00
FrancescoUK bf2c6bfa1f fix issue with sale edit 2016-03-08 21:53:29 +00:00
FrancescoUK 5588c1e22e set a ospos_session cookie name 2016-03-08 21:30:25 +00:00
FrancescoUK 525fb7dcf9 fix issue blocking searching suggestion 2016-03-08 21:28:41 +00:00
FrancescoUK e182c9d9f6 regenerate dist files 2016-03-08 21:23:05 +00:00
jekkos af69e83bda Add jquery-ui.css in dist file + update .gitignore 2016-03-08 21:43:47 +01:00
FrancescoUK 76639f6da1 remove misleading comment from code 2016-03-08 19:50:46 +00:00
jekkos 01f59cc247 Fix jQuery migrate warnings in manage_tables (#328) 2016-03-08 20:46:30 +01:00
jekkos 6f6f4354fd Remove jQuery calls for attr (deprecated in newer versions) (#328) 2016-03-08 20:18:51 +01:00