mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-25 01:37:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,340 Commits 37 Branches 39 Tags
e0fdb7ed8018ad2fb144c09bc46a91c3f35f3839
Commit Graph

145 Commits

Author SHA1 Message Date
jekkos
e0fdb7ed80 Uncheck all checked inputs after table refresh (#554) 2016-05-13 08:52:45 +02:00
jekkos
cbb562add2 Fix table row update in employees and other (#556) 2016-05-13 08:26:09 +02:00
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
jekkos
19629cb05c Full delete refresh issue fix (table will fully refresh in the end) 
(#554)
 2016-05-12 20:23:21 +02:00
FrancescoUK
87c55582b6 Removed table_sorter, regen dist 2016-05-12 19:12:50 +01:00
jekkos
4c60b0f624 Fix customer delete (use same uniqueId for these tables) (#552) 2016-05-12 19:40:12 +02:00
FrancescoUK
a56984a1a0 Restore the dropdown border size to original and regen dist files 2016-05-12 18:34:48 +01:00
jekkos
2a858b3f23 Collapse rows in detailed report after delete (#507, #293) 
Hide columns without title in takings print view (#507)
Execute grunt after running bower uninstall
Try to fix integration tests
 2016-05-12 18:02:26 +02:00
jekkos
53060397e5 Fix inventory summary report (#540) 2016-05-11 21:51:54 +02:00
jekkos
349000bd8a Fix sale and receiving edit and delete in detailed report (#507, #293) 2016-05-11 17:57:37 +02:00
jekkos
b210888dac Add table export option for bootstrap tables (#293) 
Fix pagination css (remove custom style)
 2016-05-10 09:08:07 +02:00
jekkos
3cf018ac47 Regenerate js files (#537, #538) 
Remove static row tablesorter hack
Remove tablesorter plugin
 2016-05-09 20:07:04 +02:00
FrancescoUK
601fd10f4e Upgraded js plugins and regen dist files (#507) 2016-05-07 14:04:32 +01:00
jekkos
eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) 2016-05-06 00:37:46 +02:00
jekkos
408774b14c Apply ospos lines per page setting to bootstrap-table pagination (#507) 2016-05-03 18:16:50 +02:00
jekkos
c2f895c1d4 Rebase with latest master (#293, #472) 
Enable email button in customers, suppliers only if selected row has
email filled in
Disable sale/receiving edit in reports (TBC)
 2016-05-03 08:58:11 +02:00
jekkos
b37f984eb6 Fixes for item kits (new, update) (#507) 
Fixes for takings overview (pagination, sorting) (#293)
Fixes for item tax bulk update (#507)
Table rows are highlighted again before delete (#507)
 2016-05-03 08:10:38 +02:00
jekkos
e7a22e4e41 Enable bootstrap tables localisation and integrate with ospos scripts 
(#293)
Fix item bulk update (all items are updated now) (#507)
Stop click event propagation when opening modal dialog on a table row
(caused row to be selected/deselected)
 2016-05-03 08:10:37 +02:00
jekkos
9caed90aee Fix bootstrap tables toolbar icon size (#507) 2016-05-03 08:10:37 +02:00
jekkos
d5d96fa777 Add receipt button in takings (#507) 
Fix add stock location in store config
Fix stock location filtering in items module
Fix item kits barcode generation
Fix broken form after first submit in all modules
Remove temp js from dist/ (#293)
 2016-05-03 08:10:37 +02:00
jekkos
7e088348e0 Regenerate language file + js after rebase, fix various merge bugs 
(#293)
 2016-05-03 08:10:37 +02:00
jekkos
4c55da7229 Enbable inventory, count_details in items (#293) 2016-05-03 08:10:36 +02:00
jekkos
2b03d3bfd7 Continue bootstrap-tables integration (#293) 
Refactor manage_tables code and use proper js namespacing
Add glyphicons for most buttons in customers sections
Tidy up HTML in customers table page
Remove jquery-color plugin (not needed anymore)
Fix some minor css issues (feedback bar bottom margin)
 2016-05-03 08:07:48 +02:00
FrancescoUK
0dca4b8906 small tidy up (#391) 2016-04-26 19:55:09 +01:00
FrancescoUK
fa084ec8d2 revert a change affecting order or js when running grunt 2016-04-13 18:34:06 +01:00
FrancescoUK
11e3cd63e0 Move temp file in a tmp dir when generating dist files, tidy up Gruntfile.js 2016-04-12 22:26:57 +01:00
FrancescoUK
cf4fd0601f Fixed issue with missing opensourcepos_bower.css in header.php (#469) 2016-04-09 17:14:46 +01:00
FrancescoUK
1d3bcfc2ef Update jQuery to 1.12.3 and smalot-bootstrap-datetimepicker to 2.3.10 2016-04-08 23:24:41 +01:00
FrancescoUK
d83c8051f6 Rename forms to have form_ prefix, move form styles to popupbox.css 2016-04-07 20:30:42 +01:00
jekkos
2f07036940 Fix customer selection in sale form (#455) 
Fix invoice layout (restore header width)
 2016-04-06 20:22:19 +02: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
da5c821de3 tidy up of old styles, make login to use standard bootstrap, regen dist (#116) 2016-03-31 18:25:17 +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
FrancescoUK
22e38b6f2a bootstrapified and completed rework of the filters section in Sales/Takings (#116 #293) 2016-03-30 22:13:17 +01:00
FrancescoUK
7f44d379f5 removed redundant page titles, moved pagination up, adjusted styles, regen dist (#116) 2016-03-26 22:56:51 +00:00
FrancescoUK
2322682014 update bootstrap-dialog, remove jqmigrate, regen dist files (#328) 2016-03-25 21:40:09 +00: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
3a4e9d9107 remove JQmigrate, update plugins, regen dist files, manual fix of template header (#328) 2016-03-20 22:21:48 +00: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
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
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
983dad87af regenerate dist file (#394) 2016-03-14 17:21:50 +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
c124c08f89 readded bootstrap-select and adjusted styling of dropboxes (#116) 2016-03-12 10:57:24 +00:00
FrancescoUK
4433edc552 regenerate dist files (#116) 2016-03-11 17:49:05 +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
FrancescoUK
4913ffe114 regenerate dist files (but issue with search dropdown style) (#116) 2016-03-10 20:16:05 +00:00