FrancescoUK
e0745b5109
make flatly OSPOS default, tidied up stylesheets, added bootstrap-datetimepicker js no support yet ( #116 )
2016-02-13 09:54:49 +00: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
4fd7948987
Made flatly as default, various header adjustments, added login with bootstrap ( #116 )
2016-01-24 20:05:36 +00:00
cpl2015
144da1ed6b
Update theme.php
2016-01-24 02:34:36 +05:30
FrancescoUK
4cc3eadb97
Apply changes from #226 ( #116 )
2016-01-22 22:17:29 +00: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
b470fbfb3d
Fix merge miss in constants.php ( #120 )
2016-01-07 20:57:57 +00:00
FrancescoUK
1f86842757
Complete CI 3.0.3 upgrade since it wasn't done in full ( #120 )
2016-01-07 20:16:59 +00:00
FrancescoUK
14c5a0823b
Follow upgrade guideline Step 9 ( #120 )
2016-01-07 19:09:53 +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
FrancescoUK
810000e37c
#265 do not override 404 handler in routes.php
2016-01-04 18:23:16 +00:00
jekkos
e1ddcbbb5b
Rename Item_quantities model to Item_quantity
...
Rename Stock_locations model to Stock_location
Fix barcode generation in receipts (sales + receivings)
2015-09-17 21:59:33 +02:00
Martes Erede
308be8079f
[ #32 ] improving the inventory summary report, including total inventory value
2015-09-11 15:58:57 +08:00
jekkos
9281995029
Fix payment summary update on search
...
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
2015-09-04 23:14:06 +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
d35ef071bb
- Added cash only filter
...
- Set to 'all' the sale_type so even returns are shown (we might want to add a drop down filter for this too)
2015-09-04 19:30:43 +01:00
jekkos
17ac5b1837
Bump version number to 2.3.3
2015-07-25 12:03:04 +02:00
jekkos
83a297cf15
Add stock location as filter to detailed sales + receivings reports
2015-07-10 19:04:52 +02:00
jekkos
0788f4eef9
Set precision to 5 decimals (constants.php)
...
Show item description if serialized (invoice.php)
2015-06-28 14:20:39 +02:00
jekkos
6a2a5278b8
Fix general test setup (finally)
...
Add basic selenium test for application login
Adapt default database template file
Add correct db settings for travis-ci
2015-05-15 00:47:25 +02: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
81cb46bb8b
Add router for sales overview
2015-02-25 13:30:18 +01: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
jekkos-t520
344cb5c749
Add route for no_access controller with just one parameter
...
Remove permission dependency between sales, receivings and items module
Add explicit stock permission to sales and receiving modules
2015-01-25 15:46:42 +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
0863b4ebba
Add extra permissiosn checks to report methods
...
Adapt no_access page to show missing grant
Adapt Email library to customize return_path header
2014-10-16 08:20:36 +02:00
jekkos-t520
77222c1989
Fix supplier selection
2014-10-08 19:27:07 +02:00
jekkos-t520
eb51b680aa
Show stock location names in employee form
2014-10-03 00:27:50 +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-t520
8802831831
Add foregin key constraints to stock_locations and item_quantities tables
...
Requisition options is only shown when multiple stock locations are configured
Fix stock locations config in the configuration page
Rename item_quantitys to item_quantities
Fix a missing label (need to check if present in master)
Fix display of the stock quantities in items/manage view
2014-07-25 00:15:34 +02:00
Padungsak
25fa78eedb
Add multi-stock feature
...
Finished task
1. User can add stock location in config page. Adding format is StockA,StockB,StockC for example
2. Item page, there is no more quantity column show in cert table. The quantity tracking is integrated in inventory detail
3. Receiving page, There is a stock location for user to select before receiving or returning stuff
4. Sale page, There is a stock location which is for user to select a stock location they sell from
Remain task
1. Requisition work flow
2. Language editing
3. Remove unuse code
PS
2014-07-02 11:58:08 +07:00
jekkos-t520
4f367eb168
Merge branch 'master' into merge/padungsak
...
Conflicts:
application/views/config.php
2014-06-30 11:30:08 +02:00
jekkos
7688a1c0e5
Upgrade to CodeIgniter 2.2
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@100 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-06-27 22:12:48 +00:00
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
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
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
pappastech
f54ce7e1df
Initial commit
2014-02-25 17:34:25 -05:00
