FrancescoUK
79361c976c
Refactoring around items and sales search
2015-09-28 19:21:35 +01:00
FrancescoUK
ba6ecf0319
#132 Fix date range missing end date items
2015-09-23 18:04:04 +01:00
FrancescoUK
d9c49c1a72
#132 revert a modification in item model
2015-09-23 13:00:34 +01:00
FrancescoUK
5af7473769
#132 Set 1-1-2010 as starting date for the date range
2015-09-22 19:01:40 +01:00
FrancescoUK
aa9cd1fe6a
#132 Make sure we don't show multiple times the same item given a range
2015-09-22 18:38:21 +01:00
FrancescoUK
58899ca4cf
#132 Added date range in item model. Smoke test fine, more to test
2015-09-22 18:38:20 +01:00
FrancescoUK
404bc47e96
#132 Added date picker to Items manage, added date range to controller + model
2015-09-22 18:38:19 +01:00
FrancescoUK
f97e02c3d4
Items: allow custom field suggestion and search if checkbox is ticked
2015-09-19 17:46:28 +01:00
FrancescoUK
d5cf608bac
Fix to #152 remove name of people from code comment and add them to COPYING license file
2015-09-18 18:33:22 +02:00
FrancescoUK
c48106f2f5
Fix items view search issue having a ' in the string. Bug #149
2015-09-17 21:59:34 +02:00
FrancescoUK
10ea821b2a
Leave item_number empty if Code39/128 is selected
...
Added Empty UPC checkbox in Items view to easily select empty items that need barcode code generation and in case of EAN8/13 fill in item_number
Added language for Empty UPC string
Indentation/spacing adjustment
2015-09-15 17:49:51 +01:00
FrancescoUK
cf0276c772
If item_number (UPC/EAN/ISBN) is empty and a new barcode is generated save it in the item_number field and update the item entry
...
Refactoring of barcode_lib
Some code alignment adjustment here and there
2015-09-15 11:13:58 +01:00
FrancescoUK
8f2740d349
Centred barcode image
...
Moved $data to base class and added getData
Fixed indentation
2015-09-14 23:20:20 +01:00
jekkos
3e24b9caff
Remove non working datepicker icon
...
Remove in_array check for duplicated company_name
2015-08-24 21:52:41 +02:00
jekkos
517363b485
Fix deleted checkbox in items form
...
Clear suggestion cache when toggling deleted filter
2015-08-18 18:10:00 +02:00
FrancescoUK
9f1485cfe5
Added Cost & Count to reports, improved Items suggest, added copyrights and some fixes
...
Added cost and count to reports
- Added cost in temp table, reports at bottom of page and in each
summary and detailed report
- Added count in all the reports
- Renamed some report fields name to make it generic and consistent
across views
- Fixed few issues here and there
- Adjusted some code indentation
NOTE: Proper translation of word Cost is required in all the languages
but English
Improved Items suggestion
- Added select to restrict results fields
- Added distinct in suppliers instead of the array match
- Added $is_deleted in model part but is not still effective
Add copyright statements in COPYING license file
- Added jekkos and FrancescoUK / daN4cat
Other people that contributed should add their statements.
2015-08-17 11:13:04 +01:00
jekkos
0336fe6298
Stop showing duplicate suggestions for company_name
2015-08-16 15:52:25 +02:00
jekkos
4ab2ec1b5b
Add supplier attribute search for items (pull request #106 )
...
Add company name to supplier column in summary report
2015-08-16 15:41:39 +02:00
jekkos
70b7a03c63
Show item location next to quantity purchased in detailed receiving and
...
sale report
Remove duplicate suggestions in sale and receiving module
Show item location on receipt if multiple are configured
Check if item location is allowed when adding items in sale or receiving
2015-07-08 21:41:41 +02:00
jekkos-t520
6faaec53d6
Fix duplicate item suggestion issue #38
...
Fix return ticket suggestion issue #38
Fix discounted_total after hitting edit in sales register
2015-03-07 21:55:15 +01:00
jekkos-t520
0e357f14f6
Add option to show total discounts on receipt
2015-03-05 08:28:58 +01:00
jekkos-t520
e0fd35220e
Add custom search back into items
...
Fix proper pagintaion for filtered item views w/o search
2015-03-04 20:53:38 +01:00
jekkos-t520
ffb8501276
Fix custom search
2015-02-27 16:03:52 +01:00
jekkos-t520
e96dd7883e
remove count_all
...
fix pagination row counts for modules
2015-02-21 23:58:31 +01:00
jekkos-t520
9e427485f3
Fix items module filtering
...
Fix double to_currency wrapper for amount_change in receipt
Fix tablesorter js error with empty tables
Upgrade tablesorter.js to latest version
Adapt some labels for dutch
2015-02-21 18:05:12 +01:00
jekkos-t520
c389e6030c
Fix pagination for all modules (links updated for index+search through
...
AJAX)
2015-02-20 17:36:03 +01:00
jekkos-t520
ade913f0e4
Merge github pull request #30
2015-02-11 16:31:31 +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
1bf839601a
Barcode patch applied (using barcodegen)
2015-02-02 12:44:58 +01:00
Martes Erede
4ddec66d7b
#27 Using bc-style operations now.
2015-01-29 16:22:44 +01:00
Martes Erede
927dbbabb6
Feature #27 : Changing cost price while receiving items
2015-01-24 21:40:07 +01:00
jekkos-t520
96c349b099
Add invoice numbering to sales module
2014-10-30 19:22:49 +01: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
2929dfe9dd
Add stock location filtering on items
2014-10-02 19:33:35 +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
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
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-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
pappastech
f54ce7e1df
Initial commit
2014-02-25 17:34:25 -05:00
objecttothis
fa3e28db52
Commit changes to models that reflect code additions
...
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@68 c3eb156b-1dc0-44e1-88ae-e38439141b53
2013-07-05 20:13:55 +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
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
