mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-11-03 04:55:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
195 Commits 59 Branches 41 Tags
1b41c93441eb5cc3fdfffed7d30b34b60f357f7e
Commit Graph
43 Commits
Author SHA1 Message Date
jekkos-t520 54fe0c4c30 Fix sales/receivings deletion 2014-11-03 19:22:36 +01:00
jekkos-t520 96c349b099 Add invoice numbering to sales module 2014-10-30 19:22:49 +01:00
jekkos-t520 9d765efc94 Add invoice number duplication check in receivings screen 
Add invoice number duplication check in receivings detailed report
 2014-10-23 18:02:33 +02:00
jekkos-t520 4e071c9fbb Fix blank page when returning receivings 
Conflicts:

	application/libraries/Receiving_lib.php
 2014-10-22 07:11:37 +02:00
jekkos-t520 fe6820920b Add edit form in detailed receivings report 
Add language lines for detailed sale & receiving validation
Add permission for getting updated sale & receiving detail row
 2014-10-21 21:39:22 +02:00
jekkos-t520 97ff190ba5 Receivings can now use invoice numbers with a specified format (in config section) 
Fix some more stock location related bugs
Some refactoring todo for creating/updating stock locations
 2014-10-05 22:53:42 +02:00
jekkos-t520 bac80e3a92 Added invoice_number field to receivings table 
Save comments field in receivings as in sales
Add translations for cancel button in receivings
Add cascading deletes for ospos_permissions
 2014-10-04 13:19:24 +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 ff7b305058 Added tax inclusive pricing to sales and receivings 2014-09-15 21:27:11 +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
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 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
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 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-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
pappastech f54ce7e1df Initial commit 2014-02-25 17:34:25 -05: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
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
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 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
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 14cae3d427 Changed 'Delete Customer' wording on Sales register screen to 'Remove Customer'. 
~Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@20 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-07-10 15:43:02 +00:00
pappastech 9bccd62f91 Correct occurrences of 'PHP Point Of Sale' in the code. 
~Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@18 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-07-10 15:15:47 +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