Commit Graph

24 Commits

Author SHA1 Message Date
jekkos
df7907fb8f Don't lose date precision when editing sale or receiving
Extend date validator to allow timestamps as well (sale + receiving)
Fix receiving edit
2015-06-20 20:58:41 +02:00
jekkos
6f7090d7ba Upgrade jquery.color
Conflicts:

	dist/opensourcepos.js
	dist/opensourcepos.min.js
2015-04-06 15:42:57 +02:00
jekkos
cae9d3b67e Remove tags:css task in Grunfile (css files are imported the old way
again)
Fix sale delete confirmation in edit dialog
Add bower.json (still unused)
Fix autogenerated javascript load order
2015-03-17 16:47:49 +01:00
jekkos-t520
aa65593ce3 Add Gruntfile.js for concat+uglification of javascript
Enable debug=true cookie for full source inclusion in header.php
Add template in header.php to inject generated javascript files
2015-03-15 16:56:37 +01:00
jekkos-t520
a39e12e76d Externalize nominatim autcomplete functionality
Add chosen language to nominatim request
2015-03-10 14:37:36 +01:00
jekkos-t520
4b48a97166 Remove duplicated labels after merge
Add accidentally removed language lines
2015-02-11 16:42:28 +01:00
jekkos-t520
ade913f0e4 Merge github pull request #30 2015-02-11 16:31:31 +01:00
jekkos-t520
4a6a69bdef Enable image headers again 2015-02-11 13:53:21 +01:00
jekkos-t520
f021215cbb Show proper error message on upload misconfiguration
Use jquery-validation to do item_number check
Fix invoice_number validation in sale edit form
2015-02-11 11:32:58 +01:00
jekkos-t520
d208e6dccb set menubar font sizes to px instead of pt
add item_number duplication check when adding new items
fix barcode on receivings receipt (after completion)
change backup db download format to gz
2015-02-10 10:56:37 +01:00
jekkos-t520
941ff4cd4a Upgrade jquery form to 3.51
Make item_number field non required
Save item_number properly
2015-02-07 20:22:21 +01:00
jekkos-t520
4d2de519a1 Set explicit version number for jquery-validation (1.13.1) 2015-02-06 17:34:37 +01:00
jekkos-t520
707114805d Fix autocomplete problem with new item in sales module 2015-02-06 15:48:57 +01:00
jekkos-t520
aebed9347b Merge branch 'feature/address_completion'
Conflicts:
	application/controllers/items.php
2015-02-06 15:01:54 +01:00
jekkos-t520
aa1c46738b Country code is now resolved using ipinfo.io api call
Address autocompletion mostly works now
2015-02-06 14:59:11 +01:00
jekkos-t520
c04fa362b1 Add database backup feature in config 2015-02-06 11:22:03 +01:00
jekkos-t520
8ccba57d98 Images are not removed from items when no file is chosen
Image thumbnails are resized proportionally and updated after update_row
refresh
Add some padding to the thumbnails
Move select specific styles to ospos.css stylesheet
2015-02-04 15:29:34 +01:00
jekkos-t520
aee5f3d27e Add ospos_grants table
Refactor permission and module system
2014-10-07 00:47:30 +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
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
pappastech
f54ce7e1df Initial commit 2014-02-25 17:34:25 -05: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
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