mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-25 17:57:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,314 Commits 37 Branches 39 Tags
8fcc24db71ebdfd4f4e4319f2c2d4aff59996f4c
Commit Graph

121 Commits

Author SHA1 Message Date
jekkos
eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) 2016-05-06 00:37:46 +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
7e088348e0 Regenerate language file + js after rebase, fix various merge bugs 
(#293)
 2016-05-03 08:10:37 +02:00
jekkos
af7b64a398 Migrate to bootstrap-tables in customers modules (#293) 2016-05-03 08:07:47 +02:00
FrancescoUK
6e82c4904f Fix missing translation (#472), add glyphicons 2016-05-01 22:11:38 +01:00
FrancescoUK
5fb73ce2cb fixed error reporting, fixed table_helper, added translations, fixed bootstrap grid, various fixes (#472) 2016-04-30 21:34:23 +01:00
FrancescoUK
4ed63cc362 Changed some to be short OSPOS, corrected some that were still PHP Point of Sale or had typos, fixed other translation issues (#391) 2016-04-25 17:26:14 +01:00
FrancescoUK
b88575b2a5 restructure store config tabs, add invoice config checkbox, add translations (#410) 2016-04-23 22:57:34 +01:00
FrancescoUK
ce2142add4 Made description and serialnumber optional in receipts (#499) 2016-04-22 21:42:17 +01:00
FrancescoUK
1ac0182867 Added discount % to customer (#375) and added Total spent by customer (#369), both added in register and form 2016-04-16 22:26:50 +01:00
FrancescoUK
c77fa6e5c4 Fixed various issues preventing all languages to work fine in all views (#470) 2016-04-09 23:37:34 +01:00
FrancescoUK
2439055f01 More Portuguese (Brazil) translations (#462) 2016-04-08 12:26:57 +01:00
FrancescoUK
ffd0f25e13 Fix to "count shown instead of quantity" on certain Reports (#453) 2016-04-08 12:03:45 +01:00
FrancescoUK
ea2a18c647 complete change of calendar language in datepicker 2016-04-06 20:26:21 +01:00
jekkos
f88f19da71 Update datepicker with date and calendar translations from system 2016-04-06 08:51:04 +02:00
FrancescoUK
afcb1641b7 Added decimals to taxes (#327), added totals rounding matching decimals (#327 #307, #429) 2016-04-02 13:59:01 +01:00
FrancescoUK
c5037c5725 add currency decimals configuration, fix quantity decimals in forms, merged helpers in locale one (#307 #429) 2016-04-01 21:07:29 +01:00
FrancescoUK
6efdccfef0 add configurable quantity decimals (#429) 2016-04-01 00:07:05 +01:00
FrancescoUK
972f0e81f4 change edit in sales/register and receiving to be a glyphicon with update label (#405 #116) 2016-03-26 10:55:07 +00:00
jekkos
f9f127e227 Disable second tax field if first is not filled (#381) 
Add extra warning if first tax is modified

Conflicts:

	application/views/items/form_bulk.php
 2016-03-23 08:10:08 +01:00
FrancescoUK
e3a10067f5 fix the missing jsPrint takings_printer in config (#394) 2016-03-15 18:09:37 +00: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
340792cfc2 change "E-mail" to be "email" (#116) 2016-03-13 10:07:59 +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
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
05a1dd561c sales/register alignments, added customer info (#116, #369) 2016-03-10 19:21:54 +00:00
FrancescoUK
626667b3fd Merge branch 'master' into bootstrapUI 2016-03-08 22:42:03 +00:00
FrancescoUK
9a71bbc620 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
517f67a3a9 remove double entry in daterangepicker translations, open calendar always (#116) 2016-03-06 21:51:46 +00:00
FrancescoUK
7f37ebf87e proper support of date range in reports input leveraging all the features, translations and fixed some bugs (#116) 2016-03-06 21:34:12 +00:00
jekkos
d78c4dec67 Add default english for other langauge labels 2016-03-06 13:34:21 +01:00
FrancescoUK
8faf1285da fix general_config tax 1 rate and name error message (#116) 2016-03-05 11:54:10 +00:00
jekkos
a201d18938 Add specific warning when stock goes below reorder level in sales (#365, #336) 2016-03-02 08:28:50 +01:00
jekkos
c9238877fa Bootstrapify report input forms, add datepicker range widget (#116) 
Move datepicker translations to datepicker_lang.csv
 2016-03-01 08:46:17 +01:00
FrancescoUK
0cd7af7c4f change file load widget in excel_import forms (#116) 
used jasny-bootstrap
 2016-02-28 16:26:58 +00:00
FrancescoUK
75cf2997b8 Complete company logo config support (#116) 
Show image when available, support button translation

Widget based on jasny-bootstrap
 2016-02-25 10:59:14 +00:00
FrancescoUK
66a5a159d8 add language support to datetimepicker using ospos translation support (#116) 
Translated languages: en, es, fr, de-CH, nl-BE
 2016-02-16 23:16:03 +00:00
FrancescoUK
e99b9cbe41 Make choose file in General Configuration bootstrap (#116) 
Used following jQuery plugin: http://gregpike.net/demos/bootstrap-file-input/demo.html
 2016-02-10 23:27:28 +00:00
FrancescoUK
1f86842757 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) 2016-01-07 20:16:59 +00:00
jekkos
eb63f49db7 Add barcode generation for EAN8 and EAN13 (#111, #246) 
Add config option to use generation when generating barcodes for an
Generate propery barcode with configured format if item_number empty
 2015-12-26 11:42:58 +01:00
jekkos
0ddd80dc2c Regenerate thai language (#205) 2015-10-20 22:00:18 +02:00
FrancescoUK
f18b54a758 #159 Fixed typo in comment 2015-09-20 09:18:57 +01:00
FrancescoUK
96973da280 Item kits issue #155 fix 
Added Kit Id column to table view
 2015-09-18 18:33:22 +02:00
FrancescoUK
3f5d0b781b Fix to $lang["common_last_page"] issue #156 2015-09-17 22:00:06 +02:00
jekkos
3c89416b83 Update languages 2015-09-15 23:21:59 +02:00
FrancescoUK
10ea821b2a Leave item_number empty if Code39/128 is selected 
Added Empty UPC checkbox in Items view to easily select empty items that need barcode code generation and in case of EAN8/13 fill in item_number
Added language for Empty UPC string
Indentation/spacing adjustment
 2015-09-15 17:49:51 +01:00
jekkos
d6f052f082 Add default translation in other languages as well (#142) 2015-09-12 20:55:54 +02:00
Martes Erede
4a8c3a83b3 [#32] adding new language-strings and running generate_languages.php 2015-09-11 15:59:27 +08:00
FrancescoUK
c87a936e22 Fix language issue 2015-09-04 23:24:53 +01:00