Commit Graph

  • c83a46c726 Add change due to sale totals row + remove checkbox after load (#559) jekkos 2016-05-16 11:22:10 +02:00
  • 20baece7c5 Fix detailed reports for employee, customer and discount (#564) jekkos 2016-05-16 10:56:28 +02:00
  • 92b88bed20 Merge branch 'master' into bootstrap-tables FrancescoUK 2016-05-14 12:22:00 +01:00
  • 45b498924c fix gitter chat badge in README FrancescoUK 2016-05-14 12:18:41 +01:00
  • fc7735ab03 Merge pull request #549 from gitter-badger/gitter-badge-1 FrancescoUK 2016-05-14 12:00:33 +01:00
  • e07ee6a505 Refresh after delete only if animations are finished (#554) jekkos 2016-05-13 17:07:14 +02:00
  • e0fdb7ed80 Uncheck all checked inputs after table refresh (#554) jekkos 2016-05-13 08:52:45 +02:00
  • cbb562add2 Fix table row update in employees and other (#556) jekkos 2016-05-13 08:26:09 +02:00
  • 7e8f0e1dc1 Enable sorting for employees, giftcards and suppliers (#555) jekkos 2016-05-12 21:29:27 +02:00
  • 139100db35 Merge branch 'master' into feature/bootstrap-tables jekkos 2016-05-12 20:27:03 +02:00
  • 19629cb05c Full delete refresh issue fix (table will fully refresh in the end) (#554) jekkos 2016-05-12 20:19:45 +02:00
  • 87c55582b6 Removed table_sorter, regen dist FrancescoUK 2016-05-12 19:12:50 +01:00
  • 4c60b0f624 Fix customer delete (use same uniqueId for these tables) (#552) jekkos 2016-05-12 19:37:32 +02:00
  • a56984a1a0 Restore the dropdown border size to original and regen dist files FrancescoUK 2016-05-12 18:34:48 +01:00
  • 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 jekkos 2016-05-12 18:02:26 +02:00
  • 5312dba499 Do not show checkbox and empty columns on takings print (#293, #507) jekkos 2016-05-12 08:47:35 +02:00
  • f7664616ec Search for item number if enter is hit in register and receiving (#507) jekkos 2016-05-12 08:34:51 +02:00
  • fdb826a8c4 Only show item suggestions with associated id in register and receiving (#540) Use correct tabindex numbering in sale register jekkos 2016-05-12 08:18:25 +02:00
  • 53060397e5 Fix inventory summary report (#540) jekkos 2016-05-11 21:51:54 +02:00
  • 349000bd8a Fix sale and receiving edit and delete in detailed report (#507, #293) jekkos 2016-05-11 17:46:03 +02:00
  • 358a9fc867 Add Gitter badge The Gitter Badger 2016-05-11 06:19:18 +00:00
  • 4b5d883c69 Remove specific input view for excel export (#535) jekkos 2016-05-10 19:04:24 +02:00
  • 498f8a06b8 Rework url generation for excel export (#539, #540) jekkos 2016-05-10 18:36:20 +02:00
  • 2171efcb7a Enable dialogs after pagination + export in summary reports (#539) jekkos 2016-05-10 18:31:08 +02:00
  • ffd212da14 Enable bstables export for tabular reports (#293, #539) jekkos 2016-05-10 09:09:58 +02:00
  • b210888dac Add table export option for bootstrap tables (#293) Fix pagination css (remove custom style) jekkos 2016-05-10 09:08:07 +02:00
  • 3b4fbce6f6 Get selected state for export using jQuery (#539) jekkos 2016-05-10 08:06:15 +02:00
  • c80b3e1c61 Fix excel export in reports section (#539) jekkos 2016-05-09 20:15:23 +02:00
  • 8fcc24db71 Fix excel export in reports section (#539) jekkos 2016-05-09 20:15:23 +02:00
  • d78c871855 Show empty column if no tax_percent found for item (#507) jekkos 2016-05-09 20:15:00 +02:00
  • 3cf018ac47 Regenerate js files (#537, #538) Remove static row tablesorter hack Remove tablesorter plugin jekkos 2016-05-09 20:07:04 +02:00
  • c3f2f41888 Fix barcode generation in items and item_kits (#537, #538) Enable sorting in takings (with static row below the table) (#293, #507) jekkos 2016-05-09 17:59:53 +02:00
  • d94b1d921e Enable sorting for items, customers, suppliers, employees and item_kits module (#293, #507) jekkos 2016-05-09 08:35:09 +02:00
  • 4e17bb7a8c Fixed broken customer suggest in sales/register (#507) FrancescoUK 2016-05-07 20:35:32 +01:00
  • 601fd10f4e Upgraded js plugins and regen dist files (#507) FrancescoUK 2016-05-07 14:04:32 +01:00
  • ac765e4667 sale_id not receiving_id in detailed sale report (#507) FrancescoUK 2016-05-07 11:55:52 +01:00
  • 3451a70fe4 Update UPGRADE.txt J Sivakumaran 2016-05-06 09:35:34 -07:00
  • 57fcd87ad4 Updated COPYING (#472) FrancescoUK 2016-05-05 19:41:06 +01:00
  • f7ea83091c Fixed mistype var causing a delete confirm box to be empty in item kits (#507) FrancescoUK 2016-05-06 19:49:09 +01:00
  • d9498964a0 Fixed missing bulk edit dialog box title (#507) FrancescoUK 2016-05-06 19:04:25 +01:00
  • 16e6042c9c Fixed missing currency symbol in Item Kits view (#507) FrancescoUK 2016-05-06 18:58:10 +01:00
  • c11a9e000d Merge pull request #534 from jsivakumaran/patch-1 FrancescoUK 2016-05-06 18:10:46 +01:00
  • a02a0c2a0b Update UPGRADE.txt J Sivakumaran 2016-05-06 09:35:34 -07:00
  • eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) jekkos 2016-05-06 00:36:37 +02:00
  • 18764d5caf Hide delete button from Takings print, fix null value for margins, add a missing / (#507) FrancescoUK 2016-05-05 22:31:24 +01:00
  • 76560ca458 Set Takings default to show today's transactions (#507) FrancescoUK 2016-05-05 19:50:55 +01:00
  • f207213474 Updated COPYING (#472) FrancescoUK 2016-05-05 19:41:06 +01:00
  • 9eb21137f6 Fixed glyphicon button space and completed sales & register glyphicons (#507) FrancescoUK 2016-05-05 16:44:09 +01:00
  • 488af06663 Fix delete in Item model (#507) jekkos 2016-05-03 22:41:44 +02:00
  • de711b82dd Fix item delete (#525) jekkos 2016-05-03 21:35:46 +02:00
  • 408774b14c Apply ospos lines per page setting to bootstrap-table pagination (#507) jekkos 2016-05-03 18:16:50 +02:00
  • e2f6bf283c Show invoice icon if invoices enabled in config (#507) Fix limit query for customers table (#507) Add reference to translation when no persons found (#507) jekkos 2016-05-03 18:09:58 +02:00
  • 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) jekkos 2016-05-03 08:58:11 +02:00
  • 2adc096eeb Add invoice number and payment type in takings overview (#507) jekkos 2016-05-02 23:02:42 +02:00
  • 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) jekkos 2016-05-02 19:47:02 +02:00
  • 130f749a48 Fix item delete (#507) jekkos 2016-05-02 08:36:39 +02:00
  • 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) jekkos 2016-04-28 22:10:47 +02:00
  • c568c08595 Fix bulk update with bootstrap-tables (#507) jekkos 2016-04-28 08:21:30 +02:00
  • 9caed90aee Fix bootstrap tables toolbar icon size (#507) jekkos 2016-04-28 00:16:00 +02:00
  • 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) jekkos 2016-04-27 18:34:10 +02:00
  • 7e088348e0 Regenerate language file + js after rebase, fix various merge bugs (#293) jekkos 2016-04-26 00:14:07 +02:00
  • c9142ca69b Fix payment summary in sales (#293) Add glyphicons to buttons in register + receiving views Refactor table_support init function Various bugfixes jekkos 2016-04-25 23:26:58 +02:00
  • 2dab5e0fe7 Bootstrap-tables integration for sales module (WIP) (#293) Refactor manage_tables, remove public function identifiers jekkos 2016-04-25 08:58:32 +02:00
  • e7439c1616 Start bootstrap tables migration for sales module (#293) jekkos 2016-04-24 16:19:14 +02:00
  • 4624665726 Replace submit with close button in count details view (#293) jekkos 2016-04-24 13:32:33 +02:00
  • 8cf32f4470 Fix item kits view + search, item bulk edit (#293) Refactored table_helper to add first and last column automatically jekkos 2016-04-22 08:47:56 +02:00
  • 4c55da7229 Enbable inventory, count_details in items (#293) jekkos 2016-04-21 08:48:40 +02:00
  • 48c49ddb74 Fix item kits glyphicons + new button tooltip (#293) jekkos 2016-04-20 23:26:01 +02:00
  • 9dfb2196e5 Use form-inline to style items toolbar (#293) jekkos 2016-04-20 23:16:02 +02:00
  • e09ebcaff9 Filters in items module working and on one line (#293) jekkos 2016-04-20 17:59:12 +02:00
  • bb95a120b1 Enable bootstrap-tables for items modules - wip (#293) jekkos 2016-04-20 08:49:20 +02:00
  • 46ad34548f Enable bootstrap-tables for item kits module (#293) jekkos 2016-04-17 00:20:04 +02:00
  • 3b9ae1d807 Enable bootstrap-tables for giftcards module (#293) jekkos 2016-04-16 23:29:51 +02:00
  • 0cd45e275e Enable bootstrap-tables for suppliers module (#293) Reuse generic manage view for suppliers and remove original one jekkos 2016-04-15 08:49:28 +02:00
  • 873d14aac6 Enable bootstrap tables in employees module (#293) jekkos 2016-04-15 08:23:45 +02:00
  • 6f011da3ae Fix customer import (#293) jekkos 2016-04-15 08:08:24 +02:00
  • 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) jekkos 2016-04-14 21:31:01 +02:00
  • af7b64a398 Migrate to bootstrap-tables in customers modules (#293) jekkos 2016-04-01 18:30:26 +02:00
  • 6e82c4904f Fix missing translation (#472), add glyphicons FrancescoUK 2016-05-01 22:11:38 +01:00
  • a090ecb1a5 Merge branch 'RamkrishnaMondal-master' FrancescoUK 2016-04-30 22:22:16 +01:00
  • a745c52bd5 Merge branch 'master' of https://github.com/RamkrishnaMondal/opensourcepos into RamkrishnaMondal-master FrancescoUK 2016-04-30 22:21:14 +01:00
  • c9f8ca6771 disable the feature completely in case the permission is not granted (#472) FrancescoUK 2016-04-30 22:06:32 +01:00
  • 10e2aa873c fixed missing Croatian translation (#472) FrancescoUK 2016-04-30 18:41:54 +01:00
  • 0eecaf4268 fixed required fields in sms_form (#472) FrancescoUK 2016-04-30 18:32:13 +01:00
  • 1f9c31da41 regen database scripts (#472) FrancescoUK 2016-04-30 18:28:28 +01:00
  • 5fb73ce2cb fixed error reporting, fixed table_helper, added translations, fixed bootstrap grid, various fixes (#472) FrancescoUK 2016-04-30 17:54:17 +01:00
  • 2b9c9ce203 enable errors, refactor code, various issues fixing, upgrade database script (#472) FrancescoUK 2016-04-30 09:50:01 +01:00
  • 225a42be8a Regenerate translations after Portuguese (Brazil) amendment FrancescoUK 2016-04-29 19:07:37 +01:00
  • 8042b6aa53 Pequenas modificações arteiro 2016-04-28 12:40:55 -03:00
  • d01e9ffcfe Sixth commit RamkrishnaMondal 2016-04-28 19:40:14 +05:30
  • cde401a078 Fifth commit RamkrishnaMondal 2016-04-28 13:27:20 +05:30
  • ee237c3c2e Fourth commit RamkrishnaMondal 2016-04-28 13:22:01 +05:30
  • 0dca4b8906 small tidy up (#391) FrancescoUK 2016-04-26 19:55:09 +01:00
  • e81bf14d91 fix code comment typo (#410) FrancescoUK 2016-04-26 18:50:01 +01:00
  • d330472158 Third commit RamkrishnaMondal 2016-04-26 19:27:44 +05:30
  • 0d759ddd4e Second commit RamkrishnaMondal 2016-04-26 16:38:13 +05:30
  • 638e9ff535 First commit RamkrishnaMondal 2016-04-26 16:04:17 +05:30
  • 3785cdb675 Merge pull request #1 from jekkos/master RamkrishnaMondal 2016-04-26 03:22:37 +05:30
  • 4ed63cc362 Changed some to be short OSPOS, corrected some that were still PHP Point of Sale or had typos, fixed other translation issues (#391) FrancescoUK 2016-04-25 17:26:14 +01:00
  • 01d68ce3d5 Changed logo and favicon (#391) FrancescoUK 2016-04-25 16:38:42 +01:00