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

50 Commits

Author SHA1 Message Date
FrancescoUK
626667b3fd Merge branch 'master' into bootstrapUI 2016-03-08 22:42:03 +00:00
FrancescoUK
5588c1e22e set a ospos_session cookie name 2016-03-08 21:30:25 +00:00
FrancescoUK
525fb7dcf9 fix issue blocking searching suggestion 2016-03-08 21:28:41 +00:00
FrancescoUK
1a1266a20c touched version to be 2.4.0, updated README.md, enabled Cross Site Request Forgery in config.php 2016-03-08 18:19:28 +00:00
FrancescoUK
b9262230d1 Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
5df62610d2 Upgrade to CI 3.0.4 (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
c512d7167d Change config language to be 'en' consistent with the OSPOS language identifiers (#120) 
However language support doesn't work properly at the moment.
 2016-03-08 17:44:59 +00:00
FrancescoUK
b27d3c04c9 Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120) 
Apparently the upgrade wasn't complete.
 2016-03-08 17:44:59 +00:00
Toni Haryanto
75fa1a8167 Upgrade to Code Igniter 3.0.3 (#120) 2016-03-08 17:41:16 +00:00
FrancescoUK
38ecacc62f mark OSPOS with Bootstrap3 vs 3.0.0 (#116) 2016-03-08 17:17:13 +00:00
jekkos
d4f456d868 Bump version strings to 2.3.5 2016-02-29 22:36:25 +01:00
FrancescoUK
e35bd81c8b Fix File Choose boostrap jQuery plugin not working with latest submission (#116) 2016-02-11 08:13:06 +00:00
jekkos
eee87c7bc2 Bootstrapify config module 2016-02-09 17:59:35 +01:00
FrancescoUK
830f714a44 Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 (#120) 2016-01-18 23:01:42 +00:00
FrancescoUK
c2eaf88d74 Upgrade to CI 3.0.4 (#120) 2016-01-17 18:33:26 +00:00
FrancescoUK
cd7060afed Change config language to be 'en' consistent with the OSPOS language identifiers (#120) 
However language support doesn't work properly at the moment.
 2016-01-07 19:09:53 +00:00
FrancescoUK
347609d20c Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120) 
Apparently the upgrade wasn't complete.
 2016-01-07 19:09:53 +00:00
Toni Haryanto
d8057830c6 Upgrade to Code Igniter 3.0.3 (#120) 2016-01-07 19:06:35 +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
17ac5b1837 Bump version number to 2.3.3 2015-07-25 12:03:04 +02:00
jekkos-t520
d3b9bc08c9 Merge branch 'master' into feature/barcode_patch 2015-02-02 12:54:04 +01:00
jekkos-t520
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +01:00
jekkos-t520
bd763596b9 Bump version to 2.3.2 2015-02-01 14:48:25 +01:00
Malte Srocke
acb764a040 Changing config-sess_table_name value so no error occurs if dbprefix is changed to something else than "ospos_" 2015-01-14 23:34:43 +01:00
jekkos-t520
77222c1989 Fix supplier selection 2014-10-08 19:27:07 +02:00
jekkos-t520
4b16b68f24 Added more granular permissions for report module 
Extend permission system to allow 'submodule' permissions
Add permissions for stock locations (multistore support)
 2014-09-22 20:41:53 +02:00
jekkos-t520
e53265cca8 Requisition is now registered as receiving for destination stock and return for source stock 
Remove specific requisition report and code
Adapt receivings report to show requisitions in a generic way
 2014-08-07 12:50:42 +02: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
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-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
7177d19af3 Removed duplicated system language folders 2014-02-27 22:48:51 +01:00
pappastech
f54ce7e1df Initial commit 2014-02-25 17:34:25 -05:00
jekkos
59bafd9885 Config file set correctly now 2013-11-04 22:48:34 +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
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
a8dfa2dbe8 * Ver. 2.0.2 
+ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a
  second giftcard added would have its balance set to $0 even if the sale did
  not require the total of the second giftcard to pay the remaining amount due.
+ Small code cleanup

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@58 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-03-05 03:09:38 +00:00
pappastech
70c172f7bb Implement fix for Open Flash Chart not displaying in Firefox. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@57 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-09-06 23:16:32 +00:00
pappastech
a61e9ab274 Fixed last item on the list which was to get the language selection working from the config area of the site versus having to change the language in the application/config/config.php file. 
We're now at version 2.0!

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@55 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-09-06 19:48:40 +00:00
pappastech
591da46e76 Code clean up, fix for not being able to delete payment types with spaces in the name. 
Updated to version 2.0_RC8.

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@54 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-08-07 23:35:33 +00:00
pappastech
0a35b82ef5 Version updated to 2.0_RC7. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@53 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-08-07 23:11:07 +00:00
pappastech
4c580d13ff Incorporated changes proposed to fix '6 items in cart limit'. This limit was due to the 4kB limit imposed on cookies. The change pushes cart item storage to the database instead of in cookies. A database change was also made in this version to work with the code change. 
Version updated to 2.0_RC7.

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@52 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-08-07 23:09:09 +00:00
pappastech
977c2875b2 Version updated to 2.0_RC6. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@51 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-08-07 22:16:46 +00:00
pappastech
d3013409b1 Updated version in config.php to match released version (RC5). 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@49 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-07-24 10:53:06 +00:00
pappastech
dfe158aca1 Pagination in the items area works now. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@42 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-27 01:35:36 +00:00
pappastech
ed2de61aeb Upgrade to 2.0_RC2 to fix barcodes on receipts. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@40 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-26 01:40:46 +00:00
pappastech
ecdf3a5aa1 Version 2.0_RC1. Upgrade to CI 2.1.0. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@24 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:16:01 +00:00
pappastech
335982638e Upgrading to CI 2.1.0 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@23 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:11:50 +00:00
pappastech
a9af0eccf3 Updated code so that the version number only has to be changed in one place. 
~Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@19 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-07-10 15:30:59 +00:00
pappastech
b089d5b73f Initial commit of release 1.0. 
~ Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@5 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-06-08 13:21:52 +00:00