mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-08 00:59:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
119 Commits 63 Branches 39 Tags
e1bfac5eaef0853be7c682ee4308b749e3bfe1ef
Commit Graph

67 Commits

Author SHA1 Message Date
jekkos-t520
e1bfac5eae requisition receipt fixed 
database.sql script merged with current ospos one
remaining problems in reporting (sale_type to add in sales_temp query?)
data model should be refactored to allow more genericity for custom item locations (2+)
inventory tracking should be adapted to use multiple locations (instead of duplicating items for different locations)
 2014-06-15 15:30:32 +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
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-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
f54ce7e1df Initial commit 2014-02-25 17:34:25 -05: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
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
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
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
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
09e90899ff Implement fix for Open Flash Chart not displaying in Firefox. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@56 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-09-06 23:14:51 +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