mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-28 11:11:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
128 Commits 37 Branches 39 Tags
2.2.2
Commit Graph

128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jekkos-t520
60eb493b1f Database script renamed 2.2.2 2014-08-19 12:11:08 +02:00
jekkos-t520
a65f2f41b8 Add database migration script for 2.2.0 2014-08-08 17:40:50 +02:00
jekkos
dfaa3692e0 Remove multiple ci_session cookies from headers in sales and recevings 
Fix nginx compatibility (spurious 502 bad gateway)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@107 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-05 23:54:50 +00:00
jekkos
ed1be14e06 Remove swap file 
Update .gitignore to ignore .swp files

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@106 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-04 21:02:53 +00:00
jekkos
3838147bb9 All database types used in amount calculations changes to decimal(15,2) 
Removed round() statements in sale temp table, precision is defined by datatypes
Removed round() statement in receiving temp table, precision is defined by datatypes

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@105 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-04 21:01:47 +00:00
jekkos
015392c8b7 Add delete checkbox to item form view 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@104 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-01 20:46:37 +00:00
jekkos
75bb5595c0 Add thai language 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@103 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-30 09:28:03 +00:00
jekkos
fb244b629e Add extra escape sequences for french 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@102 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-30 08:38:27 +00:00
jekkos
3ce608737e Added french as a language 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@101 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-28 09:56:54 +00:00
jekkos
7688a1c0e5 Upgrade to CodeIgniter 2.2 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@100 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-27 22:12:48 +00:00
jekkos
827d6cd686 Remove empty language directories 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@99 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-04-02 16:55:09 +00:00
jekkos
79f0e4396f Release version set to 2.2.1 
Default time_sess_to_expire set to 86400 (24h)
Suspended sales labels updated to fit UI a bit better
Updated suspended css (for labels not spanning the whole thickbox width)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@98 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-30 19:07:25 +00:00
jekkos
f6e5ae3d12 Fix barcode generation for receiving receipts 
Minor code cleanup in items management javascript

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@97 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-19 23:29:19 +00:00
jekkos
dc0f8147f5 Indonesian language files updated (Oktafianus) 
Added labels for receipt_number
Remove merge tags from language files

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@96 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-17 21:18:17 +00:00
jekkos
bae6f10d7d Added edit/delete functionality in detailed sales report 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@95 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-17 16:29:13 +00:00
jekkos
7cba7e3b56 Added labels for payment type and amount in cash register 
Minor js refactoring for highlighting / animating rows
Dutch translations updated for giftcards (fitting UI a bit better)
Version set to 2.2.0

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@94 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-16 22:24:38 +00:00
jekkos
174538f733 Merge with svn repository 
Conflicts:
	application/language/dutch/index.html
	application/language/en/form_validation_lang.php
	application/language/en/sales_lang.php
	application/language/id/form_validation_lang.php
	application/language/nl-BE/index.html
	application/language/ru/form_validation_lang.php
	application/views/config.php
	system/language/Azərbaycanca/index.html
	system/language/en/calendar_lang.php
	system/language/en/date_lang.php
	system/language/en/db_lang.php
	system/language/en/email_lang.php
	system/language/en/ftp_lang.php
	system/language/en/imglib_lang.php
	system/language/en/index.html
	system/language/en/migration_lang.php
	system/language/en/number_lang.php
	system/language/en/profiler_lang.php
	system/language/en/unit_test_lang.php
	system/language/en/upload_lang.php
	system/language/nl-BE/index.html

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@93 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-10 22:01:18 +00:00
jekkos
9889263a11 Updated .gitignore 
Updated license

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@92 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-10 22:01:15 +00:00
jekkos
d69dd3740b Merge branch 'master' into git-svn 
Conflicts:
	application/language/en/form_validation_lang.php
	application/language/id/form_validation_lang.php
	application/language/nl-BE/index.html
	application/language/ru/form_validation_lang.php
	system/language/en/calendar_lang.php
	system/language/en/date_lang.php
	system/language/en/db_lang.php
	system/language/en/email_lang.php
	system/language/en/ftp_lang.php
	system/language/en/imglib_lang.php
	system/language/en/index.html
	system/language/en/migration_lang.php
	system/language/en/number_lang.php
	system/language/en/profiler_lang.php
	system/language/en/unit_test_lang.php
	system/language/en/upload_lang.php
	system/language/nl-BE/index.html

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@91 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-10 22:01:11 +00:00
jekkos-t520
6c8cea9846 Merge branch 'master' of https://github.com/pappastech/ospos into ospos 
Fixed customer + supplier search box width + spinner position under linux
Fonts set to relative browser size
Dutch language files updated (missing labels added)

Conflicts:
	WHATS_NEW.txt
	application/config/autoload.php
	application/config/config.php
	application/config/migration.php
	application/config/routes.php
	application/controllers/giftcards.php
	application/controllers/items.php
	application/controllers/person_controller.php
	application/controllers/receivings.php
	application/controllers/reports.php
	application/controllers/sales.php
	application/controllers/suppliers.php
	application/helpers/table_helper.php
	application/hooks/load_config.php
	application/language/english/common_lang.php
	application/language/english/config_lang.php
	application/language/english/customers_lang.php
	application/language/english/employees_lang.php
	application/language/english/error_lang.php
	application/language/english/giftcards_lang.php
	application/language/english/index.html
	application/language/english/items_lang.php
	application/language/english/login_lang.php
	application/language/english/module_lang.php
	application/language/english/receivings_lang.php
	application/language/english/reports_lang.php
	application/language/english/sales_lang.php
	application/language/english/suppliers_lang.php
	application/libraries/Receiving_lib.php
	application/libraries/ofc-library/JSON.php
	application/libraries/ofc-library/README.txt
	application/libraries/ofc-library/dot_base.php
	application/libraries/ofc-library/json_format.php
	application/libraries/ofc-library/ofc_area_base.php
	application/libraries/ofc-library/ofc_area_hollow.php
	application/libraries/ofc-library/ofc_area_line.php
	application/libraries/ofc-library/ofc_arrow.php
	application/libraries/ofc-library/ofc_bar.php
	application/libraries/ofc-library/ofc_bar_3d.php
	application/libraries/ofc-library/ofc_bar_base.php
	application/libraries/ofc-library/ofc_bar_filled.php
	application/libraries/ofc-library/ofc_bar_glass.php
	application/libraries/ofc-library/ofc_bar_sketch.php
	application/libraries/ofc-library/ofc_bar_stack.php
	application/libraries/ofc-library/ofc_candle.php
	application/libraries/ofc-library/ofc_hbar.php
	application/libraries/ofc-library/ofc_line.php
	application/libraries/ofc-library/ofc_line_base.php
	application/libraries/ofc-library/ofc_line_dot.php
	application/libraries/ofc-library/ofc_line_hollow.php
	application/libraries/ofc-library/ofc_line_style.php
	application/libraries/ofc-library/ofc_menu.php
	application/libraries/ofc-library/ofc_pie.php
	application/libraries/ofc-library/ofc_radar_axis.php
	application/libraries/ofc-library/ofc_radar_axis_labels.php
	application/libraries/ofc-library/ofc_radar_spoke_labels.php
	application/libraries/ofc-library/ofc_scatter.php
	application/libraries/ofc-library/ofc_scatter_line.php
	application/libraries/ofc-library/ofc_shape.php
	application/libraries/ofc-library/ofc_sugar.php
	application/libraries/ofc-library/ofc_tags.php
	application/libraries/ofc-library/ofc_title.php
	application/libraries/ofc-library/ofc_tooltip.php
	application/libraries/ofc-library/ofc_x_axis.php
	application/libraries/ofc-library/ofc_x_axis_label.php
	application/libraries/ofc-library/ofc_x_axis_labels.php
	application/libraries/ofc-library/ofc_x_legend.php
	application/libraries/ofc-library/ofc_y_axis.php
	application/libraries/ofc-library/ofc_y_axis_base.php
	application/libraries/ofc-library/ofc_y_axis_label.php
	application/libraries/ofc-library/ofc_y_axis_labels.php
	application/libraries/ofc-library/ofc_y_axis_right.php
	application/libraries/ofc-library/ofc_y_legend.php
	application/libraries/ofc-library/open-flash-chart-object.php
	application/libraries/ofc-library/open-flash-chart.php
	application/models/giftcard.php
	application/models/item.php
	application/models/person.php
	application/models/receiving.php
	application/models/sale.php
	application/models/supplier.php
	application/views/config.php
	application/views/items/form.php
	application/views/items/form_bulk.php
	application/views/items/manage.php
	application/views/receivings/receiving.php
	application/views/reports/date_input.php
	application/views/reports/listing.php
	application/views/reports/tabular_details.php
	application/views/sales/edit.php
	application/views/sales/register.php
	application/views/suppliers/form.php
	css/reports.css
	css/tables.css
	database/database.sql
	import_items.csv
	index.php
	js/jquery.ajax_queue.js
	js/jquery.metadata.js
	license/license.txt
 2014-03-03 22:19:14 +01:00
jekkos-t520
ee89f1971b Deleted sales can be shown again under items 
Language folders renamed + fix for loading them
Added smoe translations to the nl-BE language
Autoload settings adapted
 2014-02-27 23:43:37 +01:00
jekkos-t520
726c357e95 Merge branch 'feature/discount_report' 2014-02-27 22:49:11 +01:00
jekkos-t520
7177d19af3 Removed duplicated system language folders 2014-02-27 22:48:51 +01:00
jekkos-t520
a813c4ad2c Merge branch 'fix/lost_sessions' 2014-02-27 22:47:20 +01:00
jekkos-t520
ae098c4724 Merge branch 'feature/lang_dutch' 2014-02-27 22:46:50 +01:00
pappastech
96b95a5dc9 Fix license 2014-02-25 17:40:58 -05:00
pappastech
5b7430d735 Fix license 2014-02-25 17:38:56 -05:00
pappastech
64d296471e Delete README.md 2014-02-25 17:36:57 -05:00
pappastech
475c0f8746 Delete LICENSE 2014-02-25 17:35:09 -05:00
pappastech
f54ce7e1df Initial commit 2014-02-25 17:34:25 -05:00
pappastech
26fa05cf74 Initial commit 2014-02-25 14:21:06 -08:00
jekkos-t520
bca03c37ab Added a global expand/collapse all control for reports sections 2014-01-21 23:47:33 +01:00
jekkos-t520
264248b381 Added autocompletion for the customer field in the sale editing screen 2013-12-13 20:26:55 +01:00
jekkos-t520
a6bd5c6f0f Added git-svn-diff.sh script for syncing with the sourceForge SVN repository 2013-11-26 19:10:27 +01:00
jekkos-t520
e01f29b1b3 This commit will fix a common problem in CodeIgniter. 
After $config['sess_time_to_update']  expires the session will be destroyed if concurrent AJAX calls are made to the framework.
Original discussion on this problem can be found on the following URL

http://stackoverflow.com/questions/7980193/codeigniter-session-bugging-out-with-ajax-calls
 2013-11-26 18:58:45 +01:00
jekkos
490ce59bbb Add specific discount report 2013-11-16 14:32:39 +01:00
jekkos
741b90de03 Dutch language files added 2013-11-09 00:37:07 +01:00
pappastech
8f5c5f093c git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@90 c3eb156b-1dc0-44e1-88ae-e38439141b53 2013-11-07 03:04:55 +00:00
pappastech
2570f28242 Fix missing comma in database.sql. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@89 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-11-06 21:04:33 +00:00
jekkos
59bafd9885 Config file set correctly now 2013-11-04 22:48:34 +00:00
pappastech
f562093475 Update file paths to be UTF8 as some systems don't appear to support Unicode file paths. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@88 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-30 02:02:10 +00:00
pappastech
2f0bd8db2f Update file paths to be UTF8 as some systems don't appear to support Unicode file paths. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@87 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-30 01:53:56 +00:00
pappastech
d1272ac954 Update file paths to be UTF8 as some systems don't appear to support Unicode file paths. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@86 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-30 01:48:15 +00:00
pappastech
a2aafc245e Update file paths to be UTF8 as some systems don't appear to support Unicode file paths. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@85 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-30 01:48:02 +00:00
pappastech
f7746edc4c Update file paths to be UTF8 as some systems don't appear to support Unicode file paths. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@84 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-30 01:47:23 +00:00
pappastech
b0dbd54379 Updating version number with new database structure. 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@83 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-28 01:49:35 +00:00
pappastech
a7ac6e84b3 Adding the additional fields to database.sql to get the database up to date with this version of code. 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@82 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-28 01:47:48 +00:00
pappastech
d2167db8c6 git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@81 c3eb156b-1dc0-44e1-88ae-e38439141b53 2013-10-22 14:14:46 +00:00
pappastech
b21f5f7258 Due to a remote code execution vulnerability found in PHP Point of Sale, I'm removing the ofc_upload_image.php file to prevent exploitation of Open Source Point of Sale. 
All users are strongly encouraged to upgrade to version 2.1.0.

Various upgrades have been included in this release as well. Many thanks to user objecttothis for all his hard work.

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@80 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-22 00:35:23 +00:00
pappastech
c1254138d6 Due to a remote code execution vulnerability found in PHP Point of Sale, I'm removing the ofc_upload_image.php file to prevent exploitation of Open Source Point of Sale. 
All users are strongly encouraged to upgrade to version 2.0.3.

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@79 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-22 00:28:54 +00:00