mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-16 23:38:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
157 Commits 49 Branches 39 Tags
2929dfe9ddacd45c8fd4a244e2c2b54ddffbcdd3
Commit Graph
157 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jekkos-t520 2929dfe9dd Add stock location filtering on items 2014-10-02 19:33:35 +02:00
jekkos-t520 290533612e Fix submodules in header 2014-09-29 21:06:06 +02:00
jekkos-t520 13127c4dc7 Deny access to report submodules on which employee doesn't have permissions 2014-09-24 08:47:00 +02:00
jekkos-t520 5cf73130c5 Modules are not accessible if employee has no permissions on at least one of it's submodules 
Some more db script modifications
 2014-09-23 19:14:25 +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 e03611080e Merge branch 'feature/tax_included_pricing' 2014-09-15 21:27:33 +02:00
jekkos-t520 ff7b305058 Added tax inclusive pricing to sales and receivings 2014-09-15 21:27:11 +02:00
jekkos-t520 0d76974e69 Discount field in receiving made editable again 2014-09-15 20:18:24 +02:00
jekkos-t520 87c242b35f Discount field in receiving made editable again 2014-09-15 20:14:37 +02:00
jekkos-t520 e43f7ac7bb Add deleted checkbox filter in items page (was remove due to wrong merge) 2014-09-10 19:03:19 +02:00
jekkos c9c389e9f3 Update README and WHATS NEW 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@132 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-09-10 18:58:56 +02:00
jekkos-t520 b06e103895 Database script renamed 2014-08-17 01:55:51 +02:00
jekkos-t520 2cb322f88f Default stock name is the same as in update script 2014-08-17 01:45:36 +02:00
jekkos-t520 ed15532cc4 Merge branch 'merge/padungsak' 
Conflicts:
	database/database.sql
 2014-08-17 01:22:12 +02:00
jekkos-t520 a61bc10dde Location column is kept in database 
Added a data migration script for stock_locations and item_quantities tables
 2014-08-17 00:49:48 +02:00
jekkos-t520 43189d0748 Clear sale and receiving libs (sessoin state) when changing stock locations 2014-08-13 01:16:37 +02:00
jekkos-t520 e1e5434e2a Stock locations are now shown on receivings and sales receipts 
Database migration script now defines a default stock location name
Rmeove obsolete constraints from migration script
 2014-08-11 13:10:29 +02:00
jekkos-t520 aed9fb8dd7 Fix barcode generation (removed whitespace from stock_locations model) 
Fix error in receivings receipt
Update database migration script (needs more review)
 2014-08-10 17:51:14 +02:00
jekkos-t520 b3b19ab4c5 Add migration script for 2.2.2 to 2.3 
Update database script (add extra foreign keys + minor cleanup)
 2014-08-09 10:16:12 +02:00
jekkos-t520 a65f2f41b8 Add database migration script for 2.2.0 2014-08-08 17:40:50 +02:00
jekkos-t520 55ad3a20c2 Fix requisitions report (can be found under receiving type = requisitions) 2014-08-07 13:15:21 +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 cf20194e23 Fixed sale suspending / unsuspending (adapt db scripts) 
Cleanup old code
More code review
Update item_quantities database model (composite pk)
 2014-08-07 02:07:09 +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 a1e1883ddc Add quantity column in item page 
Fix bug about validating stock location config

PS
 2014-07-11 22:32:47 +07:00
jekkos dfaa3692e0 Remove multiple ci_session cookies from headers in sales and recevings 
Fix nginx compatibility (spurious 502 bad gateway)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@107 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-05 23:54:50 +00:00
jekkos-t520 9607300514 Added empty check in stock_locations config 
Rework database script (contains stock_locations + item_quantities tables)
 2014-07-05 13:47:33 +02:00
jekkos ed1be14e06 Remove swap file 
Update .gitignore to ignore .swp files

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@106 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-04 21:02:53 +00:00
jekkos 3838147bb9 All database types used in amount calculations changes to decimal(15,2) 
Removed round() statements in sale temp table, precision is defined by datatypes
Removed round() statement in receiving temp table, precision is defined by datatypes

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@105 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-04 21:01:47 +00:00
Padungsak 8e8b5d84dc Fix quantity removal in items page 
PS
 2014-07-02 20:50:32 +07: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 015392c8b7 Add delete checkbox to item form view 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@104 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-07-01 20:46:37 +00:00
jekkos-t520 4f367eb168 Merge branch 'master' into merge/padungsak 
Conflicts:
	application/views/config.php
 2014-06-30 11:30:08 +02:00
jekkos 75bb5595c0 Add thai language 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@103 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-30 09:28:03 +00:00
jekkos fb244b629e Add extra escape sequences for french 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@102 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-30 08:38:27 +00:00
jekkos 3ce608737e Added french as a language 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@101 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-06-28 09:56:54 +00: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
Padungsak d020b53215 Fix: Qty. column is not show in requisition report 
Padungsak
 2014-06-17 23:47:16 +07: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 827d6cd686 Remove empty language directories 
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@99 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-04-02 16:55:09 +00: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 d69dd3740b Merge branch 'master' into git-svn 
Conflicts:
	application/language/en/form_validation_lang.php
	application/language/id/form_validation_lang.php
	application/language/nl-BE/index.html
	application/language/ru/form_validation_lang.php
	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/@91 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2014-03-10 22:01:11 +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