mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-29 22:25:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,382 Commits 56 Branches 40 Tags
ec5fbc16b53bb1bd8482e6342ba1af435be9850e
Commit Graph
160 Commits
Author SHA1 Message Date
FrancescoUK 5531f7fa9e Added tooltip support to charts, regen dist files (#342) 2016-05-25 22:31:58 +01:00
jekkos fecb2163ea Update config_lang.csv with correct number of translations (#497) 
Update country_code tooltip css
Remove tables.css
 2016-05-24 17:46:40 +02:00
FrancescoUK 3e44c7caf5 Fixed line chart (was broken), fixed dimensions of charts, regen dist files (#342) 2016-05-24 12:14:01 +01:00
jekkos 609aef0a87 Make nominatim countrycodes configurable (#497) 2016-05-23 22:40:46 +02:00
FrancescoUK bd208c6d0d Moved chart styles to reports.css (#342) 2016-05-22 21:07:11 +01:00
FrancescoUK 41e4285d65 Removed flash library and dependencies, regen dist file (updagraded js plugins) (#342) 2016-05-22 19:59:26 +01:00
FrancescoUK 17bc62d94b Added Chartist js extra plugins and regen dist (#342) 2016-05-21 15:01:15 +01:00
FrancescoUK fa84adc536 Added Chartist js plugin and regen dist (#342) 2016-05-21 12:07:50 +01:00
jekkos 41b3d00fb2 Add modal init in postBody bstables callback (#563) 2016-05-20 17:17:12 +02:00
jekkos 9762193ce0 Fixup register css (block and alert widths) 2016-05-19 08:57:54 +02:00
jekkos ea77980bff Persist column visbility per user and per module (#563) 2016-05-18 08:49:28 +02:00
jekkos fc2d5e89f0 Remove empty column switches in dropdown (switchable on column header) (#563) 2016-05-17 08:59:51 +02:00
FrancescoUK 31dd09e09b Removed unused excel header & footer, removed obsolete style classes (#528) 2016-05-16 19:03:20 +01:00
jekkos c83a46c726 Add change due to sale totals row + remove checkbox after load (#559) 2016-05-16 11:23:06 +02:00
jekkos e07ee6a505 Refresh after delete only if animations are finished (#554) 2016-05-13 17:07:14 +02:00
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