mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-27 02:28:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
107 Commits 58 Branches 41 Tags
6c8cea98461714757c970ac6e50cfe78bbcc77f7
Commit Graph
107 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
objecttothis 224d39062f Updating Russian translation (completed) 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@78 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-08-09 14:30:16 +00:00
objecttothis 5e445000dd Addition of Russian 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@77 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:18:35 +00:00
objecttothis 927f0fde17 Changing spanish to local language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@76 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:18:18 +00:00
objecttothis fd07d6c4a2 Changing name of indonesian to the local language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@75 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:17:55 +00:00
objecttothis 6b85fec99a Addition of Azerbaijani to system 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@74 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:17:30 +00:00
objecttothis 53e385084e Not sure if this SQL dump accurately reflects the changes made to the dB or not. 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@73 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:17:02 +00:00
objecttothis c0b29c098e Changes to CSS to reflect added fields 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@72 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:15:52 +00:00
objecttothis c50fc61b6b Additional fields in configuration 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@71 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:15:19 +00:00
objecttothis a6b76ac71f Changes to items 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@70 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:14:45 +00:00
objecttothis 6e4a18d630 Changes to giftcards 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@69 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:14:28 +00:00
objecttothis fa3e28db52 Commit changes to models that reflect code additions 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@68 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:13:55 +00:00
objecttothis b75fe4b8d2 Not sure if this was removed after download or not. Should it be merged? 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@67 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:13:09 +00:00
objecttothis 95421608f2 Adding the Russian Language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@66 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:11:22 +00:00
objecttothis d3686113f5 Changing the folder to the local language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@65 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:11:01 +00:00
objecttothis abca41d2b0 Adding the Azerbaijani language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@64 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:10:41 +00:00
objecttothis 5506b10aa5 This commit is changing the folder name to the local language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@63 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:09:58 +00:00
objecttothis c6d775c948 These commits are for changes to the English Language 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@62 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:09:15 +00:00
objecttothis d6cc102a6a Commits to the changes in helpers. They have dependencies in other commits 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@61 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:08:15 +00:00
objecttothis d096028eb6 These commits affect the various controllers. They all have dependencies on other commits. 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@60 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:07:34 +00:00
objecttothis 7d124786f8 Updated /import_items.csv template to reflect additional fields added 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@59 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 14:13:01 +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