mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-09 10:38:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,127 Commits 67 Branches 39 Tags
69b3e9db529bbec5da5e2a273e9178edf85f9be8
Commit Graph

171 Commits

Author SHA1 Message Date
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
FrancescoUK
1e85edfef4 change sales/register and receiving button edit item to be update 2016-03-25 22:17:27 +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
18857aca46 fix file language issues: remove \ from French, retranslate everything but manually fix id issues with \" (#311) 2016-03-17 18:36:12 +00:00
FrancescoUK
e3a10067f5 fix the missing jsPrint takings_printer in config (#394) 2016-03-15 18:09:37 +00:00
FrancescoUK
eb838cdb9f Change table links to be glyphicons, fix tooltips sentence in sales/manage, fix sortable columns (#116) 2016-03-14 18:40:07 +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
FrancescoUK
69c1af586e relayout of sales/register right panel to follow a more logical flow (#116) 2016-03-11 17:23:32 +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
f0af6f8927 Correct spanish translations for reorder level warning (#365) 2016-03-06 13:39:11 +01:00
jekkos
d78c4dec67 Add default english for other langauge labels 2016-03-06 13:34:21 +01:00
FrancescoUK
0831089790 fix stock_config error message (#116) 2016-03-05 21:08:20 +00: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
20daecf4b1 make employees form using tabs (#116) 
There is an issue with fieldset being too short
 2016-02-28 14:03:09 +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
5b01e60ed2 Merge branch 'master' #274 change into ci3 2016-01-10 13:13:55 +00:00
jekkos
26ff81ab71 Generate languages for German (Swiss) #274 2016-01-09 17:29:57 +01: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
4ddde65b41 Bump version to 2.3.4 
Update dutch translation for company_name
Fix timeformat for date filtering in items module
 2016-01-07 19:53:52 +01:00
jekkos
ad194bd4c0 Fix typo in english translation (#260) 2016-01-01 16:46:58 +01: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
2f14a0f868 Fix typo in store language line (#247) 2015-12-13 14:15:43 +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
27f89a63be remove the - from language/id/common_lang.php 2015-09-17 22:00:06 +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
FrancescoUK
c041a18624 Added Print button to print the current view 2015-09-04 22:51:12 +01:00
jekkos
9281995029 Fix payment summary update on search 
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
 2015-09-04 23:14:06 +02:00
jekkos
f36c700129 Add date filtering in sales overview 
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
 2015-09-04 22:09:24 +02:00
FrancescoUK
d35ef071bb - Added cash only filter 
- Set to 'all' the sale_type so even returns are shown (we might want to add a drop down filter for this too)
 2015-09-04 19:30:43 +01:00
FrancescoUK
852f83a8f6 Rename Overview to be Takings (normally used word in retail world) 2015-09-04 10:31:02 +01:00