mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-01 15:15:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
640 Commits 59 Branches 40 Tags
76365afbd254d94d9aaacc10ca01acaa4531a321
Commit Graph
43 Commits
Author SHA1 Message Date
FrancescoUK e49dd4e0b9 #179 Make Items Kit icon visible on home page 
Remove the if statement that was in the end preventing any module having a _ to be displayed in the home page.
This solution is consistent with navigation bar one.

Also done some indentation in header and footer to improve readibility.
 2015-09-28 13:12:22 +01:00
jekkos c843c174ed Initialize table sorting if this didn't happen when the page was loaded 
initially (#139)
 2015-09-14 08:26:41 +02:00
jekkos 2c5f3ee759 Add grunt-cache-breaker plugin (#137) 
Fix tax inclusive pricing for daily sales overview (#136)
Fix table sorting when using search in daily sales overview (#131)
 2015-09-07 22:15:41 +02:00
jekkos 2b6b3914a7 Mark totals row as static (keep it at bottom of the table issue #131) 2015-09-06 13:19:32 +02:00
jekkos f36c700129 Add date filtering in sales overview 
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
 2015-09-04 22:09:24 +02:00
FrancescoUK 8bcd2a69dc Add better locale config support (pull request #93) 
I've added in this commit the following:

- the means to configure date and time format
- date and time is shown with the selected formats
- a locale tab in the configuration page
- changed location tab to be stock tab and the same for the file names
- translation strings (only English) for the case

NOTE 1: Not related to Locale support but I removed an extra <div
class="field_row clearfix"> from general_config.php

NOTE 2: There is no rules in the submit checks of Locale. Probably this
is something to iron out a bit

NOTE 3: It would be probably nice to add a button in the Locale tab to
regenerate all the translation files in case somebody updates the
translations .csv

Fixed Local config

- Removed text in Red as really not mandatory configuration
- Added time format in 24h and 12h

Updated General Config tab

- reorganised the layout grouping things like company info, taxes and
invoice formating
- increased the limit of max lines per page to 1000 because 50 is too
little. People can do what they want with up to 1000
 2015-07-25 12:02:10 +02:00
jekkos 83a297cf15 Add stock location as filter to detailed sales + receivings reports 2015-07-10 19:04:52 +02:00
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 9856f0bc65 Add invoice dom sanity check before print 2015-02-20 09:25:31 +01:00
jekkos-t520 babddd524c Refactor variable substitution for receiving invoice numbers 
Use localStorage to store selected printer
Add printer selection for invoice template
Print after sale checkbox is now present in receivings and sales screen
Remove print after sale options from receipt_config
Add default translations to receivings_lang.csv
Fix some bugs preventing to print and email at the same time
 2015-02-19 18:10:31 +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 da5c65e42e Fix location config bug (add check for disallowed characters) 
Add labels for different languages (just default to english for now)
 2015-02-10 16:34:16 +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 ec6455647f Merge branch 'feature/item_pics' 
Conflicts:
	database/2.3_to_2.3.1.sql
	database/database.sql
	translations/items_lang.csv
 2015-02-05 17:05:51 +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 7c24682584 Fix stock location removal 2015-02-02 16:55:26 +01:00
jekkos-t520 215a2104a1 Add item_id/upc barcode content option 
Fix tabcontent width
Improve location config screen
 2015-02-02 15:48:41 +01:00
jekkos-t520 08325c8cf7 Fix last stock_locations config quirks 2015-01-28 19:25:18 +01:00
jekkos-t520 f497ac54f1 Review stock location management in config screen (merged old refactor 
branch)
Remove some obsolete labels from tranlations csv's
 2015-01-27 23:27:43 +01:00
jekkos-t520 f323bec9ca Merge branch 'refactor/edit_stock_locations' 
Conflicts:
	application/controllers/config.php
	application/models/stock_locations.php
 2015-01-27 19:24:59 +01:00
jekkos-t520 24a6c9c34f Config location editing works now 2015-01-27 19:03:57 +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 266c2591d8 Reference Sourceforge website in footer and remove references to ospos.pappastech.com demo as there is no demo located there. 
Version updated to 2.0_RC6.

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@50 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-08-07 22:12:45 +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