jekkos-t520
54fe0c4c30
Fix sales/receivings deletion
2014-11-03 19:22:36 +01:00
jekkos-t520
3007173833
Add invoice numbering to sales module
2014-10-31 07:58:46 +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
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
08dcd9e384
Fix totals calculation in receivings module
2014-10-20 18:31:33 +02: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
dad16b7a71
Receivings comments and recv_invoice_format fields are updated on keyup now
2014-10-12 12:47:45 +02:00
jekkos-t520
ac667a23dc
Refactor report listing (again)
...
All reports have proper permissions now (categories, taxes, discounts,..)
Minor refactoring and code cleanup
2014-10-12 02:54:54 +02:00
jekkos-t520
802a0e6a59
Refactor report listing (move sales specific grants to employee model)
2014-10-09 17:56:24 +02:00
jekkos-t520
bb9ab9bd9c
Finish stock location refactoring
...
Modules are inaccessible if permissions not configured correctly
2014-10-07 21:47:07 +02:00
jekkos-t520
aee5f3d27e
Add ospos_grants table
...
Refactor permission and module system
2014-10-07 00:47:30 +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
1afbc03304
Merge branch 'feature/multistore_support' into feature/invoice_numbering
2014-10-04 16:49:22 +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
5a4ac8dde3
Fix comments in receivings
2014-10-03 17:41:39 +02:00
jekkos-t520
48acd204f1
Show stock location names in employee form
2014-10-02 23:26:29 +02:00
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
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
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-t520
ed15532cc4
Merge branch 'merge/padungsak'
...
Conflicts:
database/database.sql
2014-08-17 01:22:12 +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
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
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
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-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
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
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-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
ae098c4724
Merge branch 'feature/lang_dutch'
2014-02-27 22:46:50 +01:00
pappastech
f54ce7e1df
Initial commit
2014-02-25 17:34:25 -05:00
jekkos-t520
bca03c37ab
Added a global expand/collapse all control for reports sections
2014-01-21 23:47:33 +01:00
jekkos-t520
264248b381
Added autocompletion for the customer field in the sale editing screen
2013-12-13 20:26:55 +01: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
f562093475
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/@88 c3eb156b-1dc0-44e1-88ae-e38439141b53
2013-10-30 02:02:10 +00:00
objecttothis
c50fc61b6b
Additional fields in configuration
...
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@71 c3eb156b-1dc0-44e1-88ae-e38439141b53
2013-07-05 20:15:19 +00:00
