mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-13 12:43:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,340 Commits 57 Branches 39 Tags
e0fdb7ed8018ad2fb144c09bc46a91c3f35f3839
Commit Graph

990 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
7e8f0e1dc1 Enable sorting for employees, giftcards and suppliers (#555) 2016-05-12 21:29:27 +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
5312dba499 Do not show checkbox and empty columns on takings print (#293, #507) 2016-05-12 08:47:35 +02:00
jekkos
f7664616ec Search for item number if enter is hit in register and receiving (#507) 2016-05-12 08:36:23 +02:00
jekkos
fdb826a8c4 Only show item suggestions with associated id in register and receiving (#540) 
Use correct tabindex numbering in sale register
 2016-05-12 08:19:15 +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
4b5d883c69 Remove specific input view for excel export (#535) 2016-05-10 19:04:24 +02:00
jekkos
498f8a06b8 Rework url generation for excel export (#539, #540) 2016-05-10 18:42:18 +02:00
jekkos
2171efcb7a Enable dialogs after pagination + export in summary reports (#539) 2016-05-10 18:31:08 +02:00
jekkos
ffd212da14 Enable bstables export for tabular reports (#293, #539) 2016-05-10 09:09:58 +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
3b4fbce6f6 Get selected state for export using jQuery (#539) 2016-05-10 08:06:15 +02:00
jekkos
c80b3e1c61 Fix excel export in reports section (#539) 
Conflicts:

	application/views/reports/date_input_excel_export.php
 2016-05-09 20:20:39 +02:00
jekkos
8fcc24db71 Fix excel export in reports section (#539) 2016-05-09 20:15:23 +02:00
jekkos
d78c871855 Show empty column if no tax_percent found for item (#507) 2016-05-09 20:15:00 +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
jekkos
c3f2f41888 Fix barcode generation in items and item_kits (#537, #538) 
Enable sorting in takings (with static row below the table) (#293, #507)
 2016-05-09 18:40:13 +02:00
jekkos
d94b1d921e Enable sorting for items, customers, suppliers, employees and item_kits module (#293, #507) 2016-05-09 08:59:03 +02:00
FrancescoUK
4e17bb7a8c Fixed broken customer suggest in sales/register (#507) 2016-05-07 20:35:32 +01:00
FrancescoUK
601fd10f4e Upgraded js plugins and regen dist files (#507) 2016-05-07 14:04:32 +01:00
FrancescoUK
ac765e4667 sale_id not receiving_id in detailed sale report (#507) 2016-05-07 11:55:52 +01:00
FrancescoUK
f7ea83091c Fixed mistype var causing a delete confirm box to be empty in item kits (#507) 2016-05-06 19:49:09 +01:00
FrancescoUK
d9498964a0 Fixed missing bulk edit dialog box title (#507) 2016-05-06 19:04:25 +01:00
FrancescoUK
16e6042c9c Fixed missing currency symbol in Item Kits view (#507) 2016-05-06 18:58:10 +01:00
jekkos
eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) 2016-05-06 00:37:46 +02:00
FrancescoUK
18764d5caf Hide delete button from Takings print, fix null value for margins, add a missing / (#507) 2016-05-05 22:31:24 +01:00
FrancescoUK
76560ca458 Set Takings default to show today's transactions (#507) 2016-05-05 19:50:55 +01:00
FrancescoUK
9eb21137f6 Fixed glyphicon button space and completed sales & register glyphicons (#507) 2016-05-05 16:44:09 +01:00
jekkos
488af06663 Fix delete in Item model (#507) 2016-05-03 22:41:44 +02:00
jekkos
de711b82dd Fix item delete (#525) 2016-05-03 21:35: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
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)
 2016-05-03 18:09:58 +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
2adc096eeb Add invoice number and payment type in takings overview (#507) 2016-05-03 08:10:38 +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
130f749a48 Fix item 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
c568c08595 Fix bulk update with bootstrap-tables (#507) 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
c9142ca69b Fix payment summary in sales (#293) 
Add glyphicons to buttons in register + receiving views
Refactor table_support init function
Various bugfixes
 2016-05-03 08:10:36 +02:00